@medplum/agent 5.1.10 → 5.1.11

package/dist/cjs/index.cjs

@@ -54664,7 +54664,7 @@ function st(r6) {
   return r6.bareCriteria ? [r6.bareCriteria, ...r6.criteriaWithProps] : r6.criteriaWithProps;
 }
 var Ha = new z(1e3);
-var ln = "5.1.10-051724e";
+var ln = "5.1.11-0b5234d";
 var za = O.FHIR_JSON + ", */*; q=0.1";
 var Ja = "https://api.medplum.com/";
 var Ka = 1e3;
@@ -55389,12 +55389,20 @@ var Zt = class extends te {
     return this.fetchTokens(i);
   }
   refreshIfExpired(t) {
-    return !this.refreshPromise && this.accessTokenExpires !== void 0 && !this.isAuthenticated(t) && this.refresh(), this.refreshPromise ?? Promise.resolve();
+    return !this.refreshPromise && this.accessTokenExpires !== void 0 && !this.isAuthenticated(t) && this.refresh(t), this.refreshPromise ?? Promise.resolve();
   }
-  refresh() {
+  refresh(t) {
     if (this.refreshPromise) return this.refreshPromise;
-    if (this.refreshToken) return this.refreshPromise = this.fetchTokens({ grant_type: He.RefreshToken, client_id: this.clientId ?? "", refresh_token: this.refreshToken }), this.refreshPromise;
-    if (this.clientId && this.clientSecret) return this.refreshPromise = this.startClientLogin(this.clientId, this.clientSecret), this.refreshPromise;
+    if (!(!this.refreshToken && !(this.clientId && this.clientSecret))) return this.refreshPromise = this.runRefreshWithLock(t), this.refreshPromise;
+  }
+  async runRefreshWithLock(t) {
+    let n = () => {
+      let s = this.getActiveLogin();
+      return s?.accessToken && s.accessToken !== this.accessToken && this.setAccessToken(s.accessToken, s.refreshToken), this.isAuthenticated(t) ? Promise.resolve(this.getProfile()) : this.refreshToken ? this.fetchTokens({ grant_type: He.RefreshToken, client_id: this.clientId ?? "", refresh_token: this.refreshToken }) : this.clientId && this.clientSecret ? this.startClientLogin(this.clientId, this.clientSecret) : Promise.resolve(void 0);
+    }, i = typeof navigator < "u" ? navigator.locks : void 0;
+    if (!i?.request) return n();
+    let o2 = `medplum-refresh:${this.storage.makeKey("activeLogin")}`;
+    return i.request(o2, n);
   }
   async startClientLogin(t, n) {
     return this.clientId = t, this.clientSecret = n, this.fetchTokens({ grant_type: He.ClientCredentials, client_id: t, client_secret: n });
@@ -74717,11 +74725,12 @@ var _App = class _App {
       }
     });
     this.webSocket.addEventListener("message", async (e) => {
+      let command;
       try {
         const data2 = e.data;
         const str2 = data2.toString("utf8");
         this.log.debug(`Received from WebSocket: ${str2.replaceAll("\r", "\n")}`);
-        const command = JSON.parse(str2);
+        command = JSON.parse(str2);
         switch (command.type) {
           // @ts-expect-error - Deprecated message type
           case "connected":
@@ -74790,11 +74799,28 @@ var _App = class _App {
           case "agent:error":
             this.log.error(command.body);
             break;
-          default:
-            this.log.error(`Unknown message type: ${command.type}`);
+          default: {
+            const errMsg = `Unknown message type: ${command.type}`;
+            this.log.error(errMsg);
+            await this.sendToWebSocket({
+              type: "agent:error",
+              body: errMsg,
+              callback: command.callback
+            });
+          }
         }
       } catch (err2) {
-        this.log.error(`WebSocket error on incoming message: ${_e(err2)}`);
+        const errMsg = `WebSocket error on incoming message: ${_e(err2)}`;
+        this.log.error(errMsg);
+        try {
+          await this.sendToWebSocket({
+            type: "agent:error",
+            body: errMsg,
+            callback: command?.callback
+          });
+        } catch (sendErr) {
+          this.log.error(`Failed to send agent:error response: ${_e(sendErr)}`);
+        }
       }
     });
     return new Promise((resolve2) => {
@@ -75244,6 +75270,20 @@ ${result}`);
       }
       (0, import_node_fs4.unlinkSync)(UPGRADE_MANIFEST_PATH);
     }
+    try {
+      const release = await Cn("agent-upgrader", targetVersion);
+      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}': ${_e(err2)}`;
+      this.log.error(errMsg);
+      await this.sendToWebSocket({
+        type: "agent:error",
+        callback: message.callback,
+        body: errMsg
+      });
+      return;
+    }
     try {
       const command = __filename;
       const logFile = (0, import_node_fs4.openSync)(UPGRADER_LOG_PATH, "w+");
@@ -75353,7 +75393,13 @@ ${result}`);
   }
   pushMessage(message) {
     if (!message.remote) {
-      this.log.error("Missing remote address");
+      const errMsg = "Missing remote address";
+      this.log.error(errMsg);
+      this.addToWebSocketQueue({
+        type: "agent:error",
+        callback: message.callback,
+        body: errMsg
+      });
       return;
     }
     const address = new URL(message.remote);
@@ -75409,7 +75455,17 @@ ${result}`);
     const requestMsg = vo.parse(message.body);
     const msh10 = requestMsg.getSegment("MSH")?.getField(10);
     if (!msh10) {
-      this.log.error("MSH.10 is missing but required");
+      const errMsg = "MSH.10 is missing but required";
+      this.log.error(errMsg);
+      this.addToWebSocketQueue({
+        type: "agent:transmit:response",
+        channel: message.channel,
+        remote: message.remote,
+        callback: message.callback,
+        contentType: O.TEXT,
+        statusCode: 400,
+        body: errMsg
+      });
       return;
     }
     this.log.info(`[Request -- ID: ${msh10}]: ${requestMsg.toString().replaceAll("\r", "\n")}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medplum/agent",
-  "version": "5.1.10",
+  "version": "5.1.11",
   "description": "Medplum Agent",
   "homepage": "https://www.medplum.com/",
   "bugs": {
@@ -26,8 +26,8 @@
     "test": "jest --runInBand"
   },
   "dependencies": {
-    "@medplum/core": "5.1.10",
-    "@medplum/hl7": "5.1.10",
+    "@medplum/core": "5.1.11",
+    "@medplum/hl7": "5.1.11",
     "dcmjs-dimse": "0.3.3",
     "iconv-lite": "0.7.2",
     "semver": "7.7.4",
@@ -36,8 +36,8 @@
     "ws": "8.20.0"
   },
   "devDependencies": {
-    "@medplum/fhirtypes": "5.1.10",
-    "@medplum/mock": "5.1.10",
+    "@medplum/fhirtypes": "5.1.11",
+    "@medplum/mock": "5.1.11",
     "@types/async-eventemitter": "0.2.4",
     "@types/ws": "8.18.1",
     "mock-socket": "9.3.1",