@medplum/agent 2.1.14 → 2.1.16

package/dist/cjs/index.cjs

@@ -3698,12 +3698,12 @@ function zt(r4, e) {
   return JSON.stringify(r4, xn, e ? 2 : void 0);
 }
 function xn(r4, e) {
-  return !Tn(r4) && S(e) ? void 0 : e;
+  return !Tn(r4) && E(e) ? void 0 : e;
 }
 function Tn(r4) {
   return !!/\d+$/.exec(r4);
 }
-function S(r4) {
+function E(r4) {
   if (r4 == null)
     return true;
   let e = typeof r4;
@@ -3786,7 +3786,7 @@ function $n(r4, e, t) {
       }
     }
   let s = r4.value["_" + e];
-  if (s && (Array.isArray(i2) ? i2 = i2.map((a, c2) => s[c2] ? cr(a ?? {}, s[c2]) : a) : i2 = cr(i2 ?? {}, s)), !S(i2))
+  if (s && (Array.isArray(i2) ? i2 = i2.map((a, c2) => s[c2] ? cr(a ?? {}, s[c2]) : a) : i2 = cr(i2 ?? {}, s)), !E(i2))
     return (o === "Element" || o === "BackboneElement") && (o = t.type[0].code), Array.isArray(i2) ? i2.map((a) => or(a, o)) : or(i2, o);
 }
 function or(r4, e) {
@@ -3807,7 +3807,7 @@ function jn(r4, e) {
         break;
       }
     }
-  if (!S(n))
+  if (!E(n))
     return Array.isArray(n) ? n.map(T) : T(n);
 }
 function Pe(r4) {
@@ -3935,11 +3935,11 @@ function Wn(r4) {
   let e;
   return r4.details?.text ? r4.diagnostics ? e = `${r4.details.text} (${r4.diagnostics})` : e = r4.details.text : r4.diagnostics ? e = r4.diagnostics : e = "Unknown error", r4.expression?.length && (e += ` (${r4.expression.join(", ")})`), e;
 }
-function Et(r4) {
+function St(r4) {
   return new Tt(r4).parse();
 }
 var Q = nr(ir);
-function Sr(r4) {
+function Er(r4) {
   let e = Array.isArray(r4) ? r4 : r4.entry?.map((t) => t.resource) ?? [];
   for (let t of e)
     Gn(t);
@@ -3949,7 +3949,7 @@ function Gn(r4) {
     throw new Error("Failed loading StructureDefinition from bundle");
   if (r4.resourceType !== "StructureDefinition")
     return;
-  let e = Et(r4);
+  let e = St(r4);
   Q[r4.name] = e;
   for (let t of e.innerTypes)
     t.parentType = e, Q[t.name] = t;
@@ -4048,7 +4048,7 @@ var Tt = class {
   }
   parseElementDefinition(e) {
     let t = vr(e.max), n = e.base?.max ? vr(e.base.max) : t, i2 = { type: "ElementDefinition", value: e };
-    return { description: e.definition || "", path: e.path || e.base?.path || "", min: e.min ?? 0, max: t, isArray: n > 1, constraints: (e.constraint ?? []).map((o) => ({ key: o.key ?? "", severity: o.severity ?? "error", expression: o.expression ?? "", description: o.human ?? "" })), type: (e.type ?? []).map((o) => ({ code: ["BackboneElement", "Element"].includes(o.code) ? vt(e) : o.code ?? "", targetProfile: o.targetProfile })), fixed: Er(I(i2, "fixed")), pattern: Er(I(i2, "pattern")), binding: e.binding };
+    return { description: e.definition || "", path: e.path || e.base?.path || "", min: e.min ?? 0, max: t, isArray: n > 1, constraints: (e.constraint ?? []).map((o) => ({ key: o.key ?? "", severity: o.severity ?? "error", expression: o.expression ?? "", description: o.human ?? "" })), type: (e.type ?? []).map((o) => ({ code: ["BackboneElement", "Element"].includes(o.code) ? vt(e) : o.code ?? "", targetProfile: o.targetProfile })), fixed: Sr(I(i2, "fixed")), pattern: Sr(I(i2, "pattern")), binding: e.binding };
   }
 };
 function vr(r4) {
@@ -4063,8 +4063,8 @@ function Jn(r4, e) {
 function ee(r4, e) {
   return !r4 || !e ? false : e.startsWith(r4 + ".") || e === r4;
 }
-function Er(r4) {
-  return Array.isArray(r4) && r4.length > 0 ? r4[0] : S(r4) ? void 0 : r4;
+function Sr(r4) {
+  return Array.isArray(r4) && r4.length > 0 ? r4[0] : E(r4) ? void 0 : r4;
 }
 function Yn(r4) {
   let e = r4.slicing?.discriminator;
@@ -4112,7 +4112,7 @@ function re(r4) {
   }
 }
 var ce = () => [];
-var E = { empty: (r4, e) => l(e.length === 0), exists: (r4, e, t) => t ? l(e.filter((n) => L(t.eval(r4, [n]))).length > 0) : l(e.length > 0), all: (r4, e, t) => l(e.every((n) => L(t.eval(r4, [n])))), allTrue: (r4, e) => {
+var S = { empty: (r4, e) => l(e.length === 0), exists: (r4, e, t) => t ? l(e.filter((n) => L(t.eval(r4, [n]))).length > 0) : l(e.length > 0), all: (r4, e, t) => l(e.every((n) => L(t.eval(r4, [n])))), allTrue: (r4, e) => {
   for (let t of e)
     if (!t.value)
       return l(false);
@@ -4137,7 +4137,7 @@ var E = { empty: (r4, e) => l(e.length === 0), exists: (r4, e, t) => t ? l(e.fil
   for (let n of e)
     t.some((i2) => i2.value === n.value) || t.push(n);
   return t;
-}, isDistinct: (r4, e) => l(e.length === E.distinct(r4, e).length), where: (r4, e, t) => e.filter((n) => L(t.eval(r4, [n]))), select: (r4, e, t) => e.map((n) => t.eval(r4, [n])).flat(), repeat: ce, ofType: (r4, e, t) => e.filter((n) => n.type === t.name), single: (r4, e) => {
+}, isDistinct: (r4, e) => l(e.length === S.distinct(r4, e).length), where: (r4, e, t) => e.filter((n) => L(t.eval(r4, [n]))), select: (r4, e, t) => e.map((n) => t.eval(r4, [n])).flat(), repeat: ce, ofType: (r4, e, t) => e.filter((n) => n.type === t.name), single: (r4, e) => {
   if (e.length > 1)
     throw new Error("Expected input length one for single()");
   return e.length === 0 ? [] : e.slice(0, 1);
@@ -4196,37 +4196,37 @@ var E = { empty: (r4, e) => l(e.length === 0), exists: (r4, e, t) => t ? l(e.fil
       return l(false);
   }
   return [];
-}, convertsToBoolean: (r4, e) => e.length === 0 ? [] : l(E.toBoolean(r4, e).length === 1), toInteger: (r4, e) => {
+}, convertsToBoolean: (r4, e) => e.length === 0 ? [] : l(S.toBoolean(r4, e).length === 1), toInteger: (r4, e) => {
   if (e.length === 0)
     return [];
   let [{ value: t }] = U(e, 1);
   return typeof t == "number" ? [{ type: u.integer, value: t }] : typeof t == "string" && /^[+-]?\d+$/.exec(t) ? [{ type: u.integer, value: parseInt(t, 10) }] : typeof t == "boolean" ? [{ type: u.integer, value: t ? 1 : 0 }] : [];
-}, convertsToInteger: (r4, e) => e.length === 0 ? [] : l(E.toInteger(r4, e).length === 1), toDate: (r4, e) => {
+}, convertsToInteger: (r4, e) => e.length === 0 ? [] : l(S.toInteger(r4, e).length === 1), toDate: (r4, e) => {
   if (e.length === 0)
     return [];
   let [{ value: t }] = U(e, 1);
   return typeof t == "string" && /^\d{4}(-\d{2}(-\d{2})?)?/.exec(t) ? [{ type: u.date, value: re(t) }] : [];
-}, convertsToDate: (r4, e) => e.length === 0 ? [] : l(E.toDate(r4, e).length === 1), toDateTime: (r4, e) => {
+}, convertsToDate: (r4, e) => e.length === 0 ? [] : l(S.toDate(r4, e).length === 1), toDateTime: (r4, e) => {
   if (e.length === 0)
     return [];
   let [{ value: t }] = U(e, 1);
   return typeof t == "string" && /^\d{4}(-\d{2}(-\d{2})?)?/.exec(t) ? [{ type: u.dateTime, value: re(t) }] : [];
-}, convertsToDateTime: (r4, e) => e.length === 0 ? [] : l(E.toDateTime(r4, e).length === 1), toDecimal: (r4, e) => {
+}, convertsToDateTime: (r4, e) => e.length === 0 ? [] : l(S.toDateTime(r4, e).length === 1), toDecimal: (r4, e) => {
   if (e.length === 0)
     return [];
   let [{ value: t }] = U(e, 1);
   return typeof t == "number" ? [{ type: u.decimal, value: t }] : typeof t == "string" && /^-?\d{1,9}(\.\d{1,9})?$/.exec(t) ? [{ type: u.decimal, value: parseFloat(t) }] : typeof t == "boolean" ? [{ type: u.decimal, value: t ? 1 : 0 }] : [];
-}, convertsToDecimal: (r4, e) => e.length === 0 ? [] : l(E.toDecimal(r4, e).length === 1), toQuantity: (r4, e) => {
+}, convertsToDecimal: (r4, e) => e.length === 0 ? [] : l(S.toDecimal(r4, e).length === 1), toQuantity: (r4, e) => {
   if (e.length === 0)
     return [];
   let [{ value: t }] = U(e, 1);
   return R(t) ? [{ type: u.Quantity, value: t }] : typeof t == "number" ? [{ type: u.Quantity, value: { value: t, unit: "1" } }] : typeof t == "string" && /^-?\d{1,9}(\.\d{1,9})?/.exec(t) ? [{ type: u.Quantity, value: { value: parseFloat(t), unit: "1" } }] : typeof t == "boolean" ? [{ type: u.Quantity, value: { value: t ? 1 : 0, unit: "1" } }] : [];
-}, convertsToQuantity: (r4, e) => e.length === 0 ? [] : l(E.toQuantity(r4, e).length === 1), toString: (r4, e) => {
+}, convertsToQuantity: (r4, e) => e.length === 0 ? [] : l(S.toQuantity(r4, e).length === 1), toString: (r4, e) => {
   if (e.length === 0)
     return [];
   let [{ value: t }] = U(e, 1);
   return t == null ? [] : R(t) ? [{ type: u.string, value: `${t.value} '${t.unit}'` }] : [{ type: u.string, value: t.toString() }];
-}, convertsToString: (r4, e) => e.length === 0 ? [] : l(E.toString(r4, e).length === 1), toTime: (r4, e) => {
+}, convertsToString: (r4, e) => e.length === 0 ? [] : l(S.toString(r4, e).length === 1), toTime: (r4, e) => {
   if (e.length === 0)
     return [];
   let [{ value: t }] = U(e, 1);
@@ -4236,14 +4236,14 @@ var E = { empty: (r4, e) => l(e.length === 0), exists: (r4, e, t) => t ? l(e.fil
       return [{ type: u.time, value: re("T" + n[1]) }];
   }
   return [];
-}, convertsToTime: (r4, e) => e.length === 0 ? [] : l(E.toTime(r4, e).length === 1), indexOf: (r4, e, t) => A((n, i2) => n.indexOf(i2), r4, e, t), substring: (r4, e, t, n) => A((i2, o, s) => {
+}, convertsToTime: (r4, e) => e.length === 0 ? [] : l(S.toTime(r4, e).length === 1), indexOf: (r4, e, t) => A((n, i2) => n.indexOf(i2), r4, e, t), substring: (r4, e, t, n) => A((i2, o, s) => {
   let a = o, c2 = s ? a + s : i2.length;
   return a < 0 || a >= i2.length ? void 0 : i2.substring(a, c2);
 }, r4, e, t, n), startsWith: (r4, e, t) => A((n, i2) => n.startsWith(i2), r4, e, t), endsWith: (r4, e, t) => A((n, i2) => n.endsWith(i2), r4, e, t), contains: (r4, e, t) => A((n, i2) => n.includes(i2), r4, e, t), upper: (r4, e) => A((t) => t.toUpperCase(), r4, e), lower: (r4, e) => A((t) => t.toLowerCase(), r4, e), replace: (r4, e, t, n) => A((i2, o, s) => i2.replaceAll(o, s), r4, e, t, n), matches: (r4, e, t) => A((n, i2) => !!new RegExp(i2).exec(n), r4, e, t), replaceMatches: (r4, e, t, n) => A((i2, o, s) => i2.replaceAll(o, s), r4, e, t, n), length: (r4, e) => A((t) => t.length, r4, e), toChars: (r4, e) => A((t) => t ? t.split("") : void 0, r4, e), abs: (r4, e) => _(Math.abs, r4, e), ceiling: (r4, e) => _(Math.ceil, r4, e), exp: (r4, e) => _(Math.exp, r4, e), floor: (r4, e) => _(Math.floor, r4, e), ln: (r4, e) => _(Math.log, r4, e), log: (r4, e, t) => _((n, i2) => Math.log(n) / Math.log(i2), r4, e, t), power: (r4, e, t) => _(Math.pow, r4, e, t), round: (r4, e) => _(Math.round, r4, e), sqrt: (r4, e) => _(Math.sqrt, r4, e), truncate: (r4, e) => _((t) => t | 0, r4, e), children: ce, descendants: ce, trace: (r4, e, t) => (console.log("trace", e, t), e), now: () => [{ type: u.dateTime, value: (/* @__PURE__ */ new Date()).toISOString() }], timeOfDay: () => [{ type: u.time, value: (/* @__PURE__ */ new Date()).toISOString().substring(11) }], today: () => [{ type: u.date, value: (/* @__PURE__ */ new Date()).toISOString().substring(0, 10) }], between: (r4, e, t, n, i2) => {
-  let o = E.toDateTime(r4, t.eval(r4, e));
+  let o = S.toDateTime(r4, t.eval(r4, e));
   if (o.length === 0)
     throw new Error("Invalid start date");
-  let s = E.toDateTime(r4, n.eval(r4, e));
+  let s = S.toDateTime(r4, n.eval(r4, e));
   if (s.length === 0)
     throw new Error("Invalid end date");
   let a = i2.eval(r4, e)[0]?.value;
@@ -4254,7 +4254,7 @@ var E = { empty: (r4, e) => l(e.length === 0), exists: (r4, e, t) => t ? l(e.fil
 }, is: (r4, e, t) => {
   let n = "";
   return t instanceof M ? n = t.name : t instanceof H && (n = t.left.name + "." + t.right.name), n ? e.map((i2) => ({ type: u.boolean, value: Ae(i2, n) })) : [];
-}, not: (r4, e) => E.toBoolean(r4, e).map((t) => ({ type: u.boolean, value: !t.value })), resolve: (r4, e) => e.map((t) => {
+}, not: (r4, e) => S.toBoolean(r4, e).map((t) => ({ type: u.boolean, value: !t.value })), resolve: (r4, e) => e.map((t) => {
   let n = t.value, i2;
   if (typeof n == "string")
     i2 = n;
@@ -4367,7 +4367,7 @@ var J = class extends $ {
     super("as", e, t);
   }
   eval(e, t) {
-    return E.ofType(e, this.left.eval(e, t), this.right);
+    return S.ofType(e, this.left.eval(e, t), this.right);
   }
 };
 var v = class extends $ {
@@ -4525,7 +4525,7 @@ var B = class {
     this.args = t;
   }
   eval(e, t) {
-    let n = E[this.name];
+    let n = S[this.name];
     if (!n)
       throw new Error("Unrecognized function: " + this.name);
     return n(e, t, ...this.args);
@@ -4846,8 +4846,8 @@ var w = class {
 };
 Yi = Symbol.toStringTag;
 var Ye = class {
-  constructor() {
-    this.storage = typeof localStorage < "u" ? localStorage : new Ut();
+  constructor(e) {
+    this.storage = e ?? (typeof localStorage < "u" ? localStorage : new Ut());
   }
   clear() {
     this.storage.clear();
@@ -4902,16 +4902,32 @@ var oo = ((e) => (e.JwtBearer = "urn:ietf:params:oauth:client-assertion-type:jwt
 var en = class extends he {
   constructor(t) {
     super();
+    this.initComplete = true;
     if (t?.baseUrl && !t.baseUrl.startsWith("http"))
       throw new Error("Base URL must start with http or https");
     if (this.options = t ?? {}, this.fetch = t?.fetch ?? so(), this.storage = t?.storage ?? new Ye(), this.createPdfImpl = t?.createPdf, this.baseUrl = rn(t?.baseUrl ?? Zi), this.fhirBaseUrl = rn(Xe(this.baseUrl, t?.fhirUrlPath ?? "fhir/R4/")), this.authorizeUrl = Xe(this.baseUrl, t?.authorizeUrl ?? "oauth2/authorize"), this.tokenUrl = Xe(this.baseUrl, t?.tokenUrl ?? "oauth2/token"), this.logoutUrl = Xe(this.baseUrl, t?.logoutUrl ?? "oauth2/logout"), this.clientId = t?.clientId ?? "", this.clientSecret = t?.clientSecret ?? "", this.onUnauthenticated = t?.onUnauthenticated, this.cacheTime = t?.cacheTime ?? to, this.cacheTime > 0 ? this.requestCache = new We(t?.resourceCacheSize ?? eo) : 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);
-    else {
-      let n = this.getActiveLogin();
-      n && (this.setAccessToken(n.accessToken, n.refreshToken), this.refreshProfile().catch(console.log));
-    }
+      this.setAccessToken(t.accessToken), this.initPromise = Promise.resolve();
+    else if (this.storage.getInitPromise !== void 0) {
+      let n = this.storage.getInitPromise(), i2 = new Promise((o) => {
+        n.then(() => {
+          this.attemptResumeActiveLogin().then(o).catch(console.error), this.initComplete = true;
+        }).catch(console.error);
+      });
+      this.initPromise = i2, this.initComplete = false;
+    } else
+      this.initPromise = this.attemptResumeActiveLogin().catch(console.error);
     this.setupStorageListener();
   }
+  get isInitialized() {
+    return this.initComplete;
+  }
+  getInitPromise() {
+    return this.initPromise;
+  }
+  async attemptResumeActiveLogin() {
+    let t = this.getActiveLogin();
+    t && (this.setAccessToken(t.accessToken, t.refreshToken), await this.refreshProfile());
+  }
   getBaseUrl() {
     return this.baseUrl;
   }
@@ -5139,7 +5155,7 @@ var en = class extends he {
         target
       }
     }`.replace(/\s+/g, " "), a = await this.graphql(s);
-      Sr(a.data.StructureDefinitionList);
+      Er(a.data.StructureDefinitionList);
       for (let c2 of a.data.SearchParameterList)
         Rt(c2);
     })());

package/installer.nsi

@@ -165,11 +165,21 @@ Function InstallApp
     ExecWait "shawl-v1.3.0-win64.exe add --name $\"${SERVICE_NAME}$\" -- $\"$INSTDIR\medplum-agent-win-x64.exe$\" $\"$baseUrl$\" $\"$clientId$\" $\"$clientSecret$\" $\"$agentId$\"" $1
     DetailPrint "Exit code $1"
 
+    # Set service display name
+    DetailPrint "Setting service display name..."
+    ExecWait "sc.exe config $\"${SERVICE_NAME}$\" displayname= $\"${APP_NAME}$\"" $1
+    DetailPrint "Exit code $1"
+
     # Set service description
     DetailPrint "Setting service description..."
     ExecWait "sc.exe description $\"${SERVICE_NAME}$\" $\"Securely connects local devices to ${COMPANY_NAME} cloud$\"" $1
     DetailPrint "Exit code $1"
 
+    # Set service to start automatically
+    DetailPrint "Setting service to start automatically..."
+    ExecWait "sc.exe config $\"${SERVICE_NAME}$\" start= auto" $1
+    DetailPrint "Exit code $1"
+
     # Start the service
     DetailPrint "Starting service..."
     ExecWait "sc.exe start $\"${SERVICE_NAME}$\"" $1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medplum/agent",
-  "version": "2.1.14",
+  "version": "2.1.16",
   "description": "Medplum Agent",
   "homepage": "https://www.medplum.com/",
   "repository": {