@medplum/agent 3.2.7 → 3.2.8

package/dist/cjs/index.cjs

@@ -43104,7 +43104,7 @@ function Bn(r7) {
   return typeof r7 == "object" && !Array.isArray(r7) && !(r7 instanceof URLSearchParams) && (r7 = Object.fromEntries(Object.entries(r7).filter((e) => e[1] !== void 0))), new URLSearchParams(r7).toString();
 }
 var Io = /^(([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 ju(r7) {
+function $u(r7) {
   return Io.test(r7);
 }
 function ct(r7, e) {
@@ -44141,9 +44141,9 @@ var Dt = class {
       throw new f(h("Not a valid URL"));
     }
     let o = n?.ReconnectingWebSocket ? new n.ReconnectingWebSocket(i, void 0, { debug: n?.debug, debugLogger: n?.debugLogger }) : new Vt(i, void 0, { debug: n?.debug, debugLogger: n?.debugLogger });
-    this.medplum = e, this.ws = o, this.masterSubEmitter = new je(), this.criteriaEntries = /* @__PURE__ */ new Map(), this.criteriaEntriesBySubscriptionId = /* @__PURE__ */ new Map(), this.wsClosed = false, this.pingIntervalMs = n?.pingIntervalMs ?? Gs, this.setupWebSocketListeners();
+    this.medplum = e, this.ws = o, this.masterSubEmitter = new je(), this.criteriaEntries = /* @__PURE__ */ new Map(), this.criteriaEntriesBySubscriptionId = /* @__PURE__ */ new Map(), this.wsClosed = false, this.pingIntervalMs = n?.pingIntervalMs ?? Gs, this.currentProfile = e.getProfile(), this.setupListeners();
   }
-  setupWebSocketListeners() {
+  setupListeners() {
     let e = this.ws;
     e.addEventListener("message", (t) => {
       try {
@@ -44201,6 +44201,9 @@ var Dt = class {
         }
         e.send(JSON.stringify({ type: "ping" })), this.waitingForPong = true;
       }, this.pingIntervalMs));
+    }), this.medplum.addEventListener("change", () => {
+      let t = this.medplum.getProfile();
+      this.currentProfile && t === void 0 ? this.ws.close() : t && this.currentProfile?.id !== t.id && this.ws.reconnect(), this.currentProfile = t;
     });
   }
   emitError(e, t) {
@@ -44287,7 +44290,7 @@ var Dt = class {
     this.wsClosed || (this.wsClosed = true, this.ws.close());
   }
   reconnectWebSocket() {
-    this.ws.reconnect();
+    this.ws.reconnect(), this.wsClosed = false;
   }
   getCriteriaCount() {
     return this.getAllCriteriaEmitters().length;
@@ -44296,24 +44299,25 @@ var Dt = class {
     return this.masterSubEmitter || (this.masterSubEmitter = new je(...Array.from(this.criteriaEntries.keys()))), this.masterSubEmitter;
   }
 };
-var Ld = "3.2.7-a4111e333";
+var Ud = "3.2.8-b2b7ed8c5";
 var Ks = D.FHIR_JSON + ", */*; q=0.1";
 var zs = "https://api.medplum.com/";
 var Js = 1e3;
 var Ys = 6e4;
 var Zs = 0;
-var Xs = "Binary/";
+var Xs = 3e5;
+var ea = "Binary/";
 var hi = { resourceType: "Device", id: "system", deviceName: [{ type: "model-name", name: "System" }] };
-var ea = ((o) => (o.ClientCredentials = "client_credentials", o.AuthorizationCode = "authorization_code", o.RefreshToken = "refresh_token", o.JwtBearer = "urn:ietf:params:oauth:grant-type:jwt-bearer", o.TokenExchange = "urn:ietf:params:oauth:grant-type:token-exchange", o))(ea || {});
-var ta = ((o) => (o.AccessToken = "urn:ietf:params:oauth:token-type:access_token", o.RefreshToken = "urn:ietf:params:oauth:token-type:refresh_token", o.IdToken = "urn:ietf:params:oauth:token-type:id_token", o.Saml1Token = "urn:ietf:params:oauth:token-type:saml1", o.Saml2Token = "urn:ietf:params:oauth:token-type:saml2", o))(ta || {});
-var ra = ((o) => (o.ClientSecretBasic = "client_secret_basic", o.ClientSecretPost = "client_secret_post", o.ClientSecretJwt = "client_secret_jwt", o.PrivateKeyJwt = "private_key_jwt", o.None = "none", o))(ra || {});
-var na = ((e) => (e.JwtBearer = "urn:ietf:params:oauth:client-assertion-type:jwt-bearer", e))(na || {});
+var ta = ((o) => (o.ClientCredentials = "client_credentials", o.AuthorizationCode = "authorization_code", o.RefreshToken = "refresh_token", o.JwtBearer = "urn:ietf:params:oauth:grant-type:jwt-bearer", o.TokenExchange = "urn:ietf:params:oauth:grant-type:token-exchange", o))(ta || {});
+var ra = ((o) => (o.AccessToken = "urn:ietf:params:oauth:token-type:access_token", o.RefreshToken = "urn:ietf:params:oauth:token-type:refresh_token", o.IdToken = "urn:ietf:params:oauth:token-type:id_token", o.Saml1Token = "urn:ietf:params:oauth:token-type:saml1", o.Saml2Token = "urn:ietf:params:oauth:token-type:saml2", o))(ra || {});
+var na = ((o) => (o.ClientSecretBasic = "client_secret_basic", o.ClientSecretPost = "client_secret_post", o.ClientSecretJwt = "client_secret_jwt", o.PrivateKeyJwt = "private_key_jwt", o.None = "none", o))(na || {});
+var ia = ((e) => (e.JwtBearer = "urn:ietf:params:oauth:client-assertion-type:jwt-bearer", e))(ia || {});
 var Mt = class extends H {
   constructor(t) {
     super();
     this.initComplete = true;
     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 ?? ia(), this.storage = t?.storage ?? new qe(), this.createPdfImpl = t?.createPdf, this.baseUrl = vr(t?.baseUrl ?? zs), this.fhirBaseUrl = $(this.baseUrl, t?.fhirUrlPath ?? "fhir/R4"), this.authorizeUrl = $(this.baseUrl, t?.authorizeUrl ?? "oauth2/authorize"), this.tokenUrl = $(this.baseUrl, t?.tokenUrl ?? "oauth2/token"), this.logoutUrl = $(this.baseUrl, t?.logoutUrl ?? "oauth2/logout"), this.clientId = t?.clientId ?? "", this.clientSecret = t?.clientSecret ?? "", this.onUnauthenticated = t?.onUnauthenticated, this.cacheTime = t?.cacheTime ?? (typeof window > "u" ? Zs : Ys), this.cacheTime > 0 ? this.requestCache = new Pt(t?.resourceCacheSize ?? Js) : 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 ?? oa(), this.storage = t?.storage ?? new qe(), this.createPdfImpl = t?.createPdf, this.baseUrl = vr(t?.baseUrl ?? zs), this.fhirBaseUrl = $(this.baseUrl, t?.fhirUrlPath ?? "fhir/R4"), this.authorizeUrl = $(this.baseUrl, t?.authorizeUrl ?? "oauth2/authorize"), this.tokenUrl = $(this.baseUrl, t?.tokenUrl ?? "oauth2/token"), this.logoutUrl = $(this.baseUrl, t?.logoutUrl ?? "oauth2/logout"), this.clientId = t?.clientId ?? "", this.clientSecret = t?.clientSecret ?? "", this.onUnauthenticated = t?.onUnauthenticated, this.refreshGracePeriod = t?.refreshGracePeriod ?? Xs, this.cacheTime = t?.cacheTime ?? (typeof window > "u" ? Zs : Ys), this.cacheTime > 0 ? this.requestCache = new Pt(t?.resourceCacheSize ?? Js) : 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 } });
@@ -44618,7 +44622,7 @@ var Mt = class extends H {
   }
   async createPdf(t, n, i, o) {
     if (!this.createPdfImpl) throw new Error("PDF creation not enabled");
-    let s = aa(t, n, i, o), a2 = typeof n == "object" ? n : {}, { docDefinition: c, tableLayouts: u2, fonts: l2, ...m2 } = s, g = await this.createPdfImpl(c, u2, l2), Q = { ...m2, data: g, contentType: "application/pdf" };
+    let s = ca(t, n, i, o), a2 = typeof n == "object" ? n : {}, { docDefinition: c, tableLayouts: u2, fonts: l2, ...m2 } = s, g = await this.createPdfImpl(c, u2, l2), Q = { ...m2, data: g, contentType: "application/pdf" };
     return this.createBinary(Q, a2);
   }
   createComment(t, n, i) {
@@ -44725,7 +44729,7 @@ var Mt = class extends H {
   async download(t, n = {}) {
     this.refreshPromise && await this.refreshPromise;
     let i = t.toString();
-    i.startsWith(Xs) && (t = this.fhirUrl(i));
+    i.startsWith(ea) && (t = this.fhirUrl(i));
     let o = n.headers;
     return o || (o = {}, n.headers = o), o.Accept || (o.Accept = "*/*"), this.addFetchOptionsDefaults(n), (await this.fetchWithRetry(t.toString(), n)).blob();
   }
@@ -44880,8 +44884,8 @@ var Mt = class extends H {
     }
     return this.fetchTokens(i);
   }
-  refreshIfExpired() {
-    return !this.refreshPromise && this.accessTokenExpires !== void 0 && this.accessTokenExpires < Date.now() && this.refresh(), this.refreshPromise ?? Promise.resolve();
+  refreshIfExpired(t) {
+    return t === void 0 && (t = this.refreshGracePeriod), !this.refreshPromise && this.accessTokenExpires !== void 0 && Date.now() > this.accessTokenExpires - t && this.refresh(), this.refreshPromise ?? Promise.resolve();
   }
   refresh() {
     if (this.refreshPromise) return this.refreshPromise;
@@ -44985,7 +44989,7 @@ var Mt = class extends H {
     return this.getSubscriptionManager().getMasterEmitter();
   }
 };
-function ia() {
+function oa() {
   if (!globalThis.fetch) throw new Error("Fetch not available in this environment");
   return globalThis.fetch.bind(globalThis);
 }
@@ -45003,22 +45007,22 @@ function vi(r7) {
   let e = r7.entry?.map((t) => t.resource) ?? [];
   return Object.assign(e, { bundle: r7 });
 }
-function oa(r7) {
+function sa(r7) {
   return b(r7) && "data" in r7 && "contentType" in r7;
 }
 function xi(r7, e, t, n) {
-  return oa(r7) ? r7 : { data: r7, filename: e, contentType: t, onProgress: n };
+  return sa(r7) ? r7 : { data: r7, filename: e, contentType: t, onProgress: n };
 }
-function sa(r7) {
+function aa(r7) {
   return b(r7) && "docDefinition" in r7;
 }
-function aa(r7, e, t, n) {
-  return sa(r7) ? r7 : { docDefinition: r7, filename: e, tableLayouts: t, fonts: n };
+function ca(r7, e, t, n) {
+  return aa(r7) ? r7 : { docDefinition: r7, filename: e, tableLayouts: t, fonts: n };
 }
-var xa = [...Le, "->", "<<", ">>", "=="];
-var Ea = Ue().registerInfix("->", { precedence: y.Arrow }).registerInfix(";", { precedence: y.Semicolon });
-var Ba = [...Le, "eq", "ne", "co"];
-var $a = Ue();
+var Ta = [...Le, "->", "<<", ">>", "=="];
+var ba = Ue().registerInfix("->", { precedence: y.Arrow }).registerInfix(";", { precedence: y.Semicolon });
+var qa = [...Le, "eq", "ne", "co"];
+var Wa = Ue();
 var se = class {
   constructor(e = "\r", t = "|", n = "^", i = "~", o = "\\", s = "&") {
     this.segmentSeparator = e;
@@ -45059,7 +45063,7 @@ var Ni = class r2 {
   }
   buildAck() {
     let e = /* @__PURE__ */ new Date(), t = this.getSegment("MSH"), n = t?.getField(3)?.toString() ?? "", i = t?.getField(4)?.toString() ?? "", o = t?.getField(5)?.toString() ?? "", s = t?.getField(6)?.toString() ?? "", a2 = t?.getField(10)?.toString() ?? "", c = t?.getField(12)?.toString() ?? "2.5.1";
-    return new r2([new Ge(["MSH", this.context.getMsh2(), o, s, n, i, Ga(e), "", this.buildAckMessageType(t), e.getTime().toString(), "P", c], this.context), new Ge(["MSA", "AA", a2, "OK"], this.context)]);
+    return new r2([new Ge(["MSH", this.context.getMsh2(), o, s, n, i, Ha(e), "", this.buildAckMessageType(t), e.getTime().toString(), "P", c], this.context), new Ge(["MSA", "AA", a2, "OK"], this.context)]);
   }
   buildAckMessageType(e) {
     let t = e?.getField(9), n = t?.getComponent(2), i = t?.getComponent(3), o = "ACK";
@@ -45117,7 +45121,7 @@ var Ve = class r4 {
     return new r4(e.split(t.repetitionSeparator).map((n) => n.split(t.componentSeparator)), t);
   }
 };
-function Ga(r7) {
+function Ha(r7) {
   let e = r7 instanceof Date ? r7 : new Date(r7), n = e.toISOString().replace(/[-:T]/g, "").replace(/(\.\d+)?Z$/, ""), i = e.getUTCMilliseconds();
   return i > 0 && (n += "." + i.toString()), n;
 }
@@ -45155,7 +45159,7 @@ var Fi = class r5 {
 `) }), this.write(JSON.stringify({ level: jr[e], timestamp: (/* @__PURE__ */ new Date()).toISOString(), msg: this.prefix ? `${this.prefix}${t}` : t, ...n, ...this.metadata })));
   }
 };
-function Yf(r7) {
+function Zf(r7) {
   let e = jr[r7.toUpperCase()];
   if (e === void 0) throw new Error(`Invalid log level: ${r7}`);
   return e;
@@ -45743,7 +45747,7 @@ var App = class _App {
     if ((0, import_node_fs3.existsSync)(UPGRADE_MANIFEST_PATH)) {
       const upgradeFile = (0, import_node_fs3.readFileSync)(UPGRADE_MANIFEST_PATH, { encoding: "utf-8" });
       const upgradeDetails = JSON.parse(upgradeFile);
-      if (upgradeDetails.targetVersion === Ld.split("-")[0]) {
+      if (upgradeDetails.targetVersion === Ud.split("-")[0]) {
         await this.sendToWebSocket({
           type: "agent:upgrade:response",
           statusCode: 200,
@@ -45751,7 +45755,7 @@ var App = class _App {
         });
         this.log.info(`Successfully upgraded to version ${upgradeDetails.targetVersion}`);
       } else {
-        const errMsg = `Failed to upgrade to version ${upgradeDetails.targetVersion}. Agent still running with version ${Ld}`;
+        const errMsg = `Failed to upgrade to version ${upgradeDetails.targetVersion}. Agent still running with version ${Ud}`;
         await this.sendToWebSocket({
           type: "agent:error",
           body: errMsg,
@@ -45820,7 +45824,7 @@ var App = class _App {
             this.startWebSocketWorker();
             break;
           case "agent:heartbeat:request":
-            await this.sendToWebSocket({ type: "agent:heartbeat:response", version: Ld });
+            await this.sendToWebSocket({ type: "agent:heartbeat:response", version: Ud });
             break;
           case "agent:heartbeat:response":
             break;
@@ -46096,7 +46100,7 @@ IPv6 is currently unsupported.`;
         this.log.error(errMsg);
         throw new Error(errMsg);
       }
-      if (!((0, import_node_net.isIPv4)(message.remote) || ju(message.remote))) {
+      if (!((0, import_node_net.isIPv4)(message.remote) || $u(message.remote))) {
         const errMsg = `Attempted to ping an invalid host.
 
 "${message.remote}" is not a valid IPv4 address or a resolvable hostname.`;
@@ -46207,11 +46211,11 @@ ${result}`);
       await this.stop();
       this.log.info("Successfully stopped agent network services");
       const targetVersion = message.version ?? await fetchLatestVersionString();
-      this.log.info("Writing upgrade manifest...", { previousVersion: Ld, targetVersion });
+      this.log.info("Writing upgrade manifest...", { previousVersion: Ud, targetVersion });
       (0, import_node_fs3.writeFileSync)(
         UPGRADE_MANIFEST_PATH,
         JSON.stringify({
-          previousVersion: Ld,
+          previousVersion: Ud,
           targetVersion,
           callback: message.callback ?? null
         }),
@@ -46348,7 +46352,7 @@ async function agentMain(argv) {
   const { baseUrl, clientId, clientSecret, agentId } = args;
   const medplum = new Mt({ baseUrl, clientId });
   await medplum.startClientLogin(clientId, clientSecret);
-  const app = new App(medplum, agentId, Yf(args.logLevel ?? "INFO"));
+  const app = new App(medplum, agentId, Zf(args.logLevel ?? "INFO"));
   await app.start();
   process.on("SIGINT", async () => {
     console.log("Gracefully shutting down from SIGINT (Ctrl-C)");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medplum/agent",
-  "version": "3.2.7",
+  "version": "3.2.8",
   "description": "Medplum Agent",
   "homepage": "https://www.medplum.com/",
   "bugs": {
@@ -24,15 +24,15 @@
     "test": "jest"
   },
   "dependencies": {
-    "@medplum/core": "3.2.7",
-    "@medplum/hl7": "3.2.7",
+    "@medplum/core": "3.2.8",
+    "@medplum/hl7": "3.2.8",
     "dcmjs-dimse": "0.1.28",
     "iconv-lite": "0.6.3",
     "ws": "8.18.0"
   },
   "devDependencies": {
-    "@medplum/fhirtypes": "3.2.7",
-    "@medplum/mock": "3.2.7",
+    "@medplum/fhirtypes": "3.2.8",
+    "@medplum/mock": "3.2.8",
     "@types/async-eventemitter": "0.2.4",
     "@types/ws": "8.5.12",
     "mock-socket": "9.3.1",