@ovok/core 0.4.38 → 0.4.40

package/dist/client/auth/session-fetch.js

@@ -71,7 +71,7 @@ function createSessionFetch({ config, storage, fetchImplementation, normalizedBa
             : (0, session_http_1.withHttpErrorMetadata)(response);
     };
     const fetchWithRefreshRetry = async (url, options) => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const requestUrl = new URL(url, normalizedBaseUrl);
         if (!isTokenRefresh(url, options)) {
             const response = await fetchOnce(url, options);
@@ -166,10 +166,9 @@ function createSessionFetch({ config, storage, fetchImplementation, normalizedBa
         };
         if (config.keepSessionOnRefreshUnavailable) {
             refreshState.unavailable = true;
-            if (lastResponse) {
-                return lastResponse;
-            }
-            throw lastNetworkError !== null && lastNetworkError !== void 0 ? lastNetworkError : (0, session_http_1.refreshUnavailableError)(undefined);
+            // Medplum clears the login on any token response that isn't OK, so a 429 or 5xx goes back as a network error.
+            void ((_d = lastResponse === null || lastResponse === void 0 ? void 0 : lastResponse.body) === null || _d === void 0 ? void 0 : _d.cancel().catch(() => undefined));
+            throw lastNetworkError !== null && lastNetworkError !== void 0 ? lastNetworkError : (0, session_http_1.refreshUnavailableError)(lastResponse);
         }
         unauthenticatedReason = reason;
         markActiveAccountExpired();
@@ -179,7 +178,7 @@ function createSessionFetch({ config, storage, fetchImplementation, normalizedBa
         terminalRefreshToken = login === null || login === void 0 ? void 0 : login.accessToken;
         terminalRefreshError = lastNetworkError !== null && lastNetworkError !== void 0 ? lastNetworkError : (0, session_http_1.refreshUnavailableError)(undefined);
         clearActiveLogin();
-        (_d = config.onUnauthenticated) === null || _d === void 0 ? void 0 : _d.call(config, reason);
+        (_e = config.onUnauthenticated) === null || _e === void 0 ? void 0 : _e.call(config, reason);
         unauthenticatedReason = undefined;
         throw terminalRefreshError;
     };

package/dist/client/observation/measurement-fields.d.ts

@@ -0,0 +1,10 @@
+import { MeasurementTypeKey } from "../../types";
+import { MeasurementField } from "./types/service/MeasurementField";
+/**
+ * For each measurement type the SDK stores, its properties as their Observations store them: the
+ * code (LOINC), unit and decimals of each, the main one first. Apps read codes and units here rather
+ * than keeping their own table. Lipid panels, respiratory therapy and baby sleep list none: their
+ * values are components rather than fixed properties (see `URINE_ANALYTE_DEFINITIONS` for urine).
+ */
+export declare const MEASUREMENT_FIELDS: Readonly<Partial<Record<MeasurementTypeKey, readonly MeasurementField[]>>>;
+export type { MeasurementField };

package/dist/client/observation/measurement-fields.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MEASUREMENT_FIELDS = void 0;
+const creator_1 = require("./services/creator");
+const services = creator_1.ObservationServiceCreator.getInstance();
+/**
+ * For each measurement type the SDK stores, its properties as their Observations store them: the
+ * code (LOINC), unit and decimals of each, the main one first. Apps read codes and units here rather
+ * than keeping their own table. Lipid panels, respiratory therapy and baby sleep list none: their
+ * values are components rather than fixed properties (see `URINE_ANALYTE_DEFINITIONS` for urine).
+ */
+exports.MEASUREMENT_FIELDS = Object.fromEntries(services.getTypes().map((type) => [type, services.getService(type).getFields()]));

package/dist/client/observation/services/base-observation-service.d.ts

@@ -5,6 +5,7 @@ import { Sample } from "../types/generate-measurement/Sample";
 import { ObservationValue } from "../types/generate-observation-body/ObservationValue";
 import { IObservationService } from "../types/IObservationService";
 import { Measurement } from "../types/measurement/Measurement";
+import { MeasurementField } from "../types/service/MeasurementField";
 import { ObservationMetadata } from "../types/service/ObservationMetadata";
 export declare abstract class BaseObservationService<T extends Measurement> implements IObservationService {
     protected abstract observationMetadata: ObservationMetadata<T>[];
@@ -12,6 +13,7 @@ export declare abstract class BaseObservationService<T extends Measurement> impl
     protected abstract measurementTypeName: string;
     abstract convertSamplesToMeasurement(samples: Sample[]): T;
     abstract convertRecordToMeasurement(record: RecordResult<RecordType>): T;
+    getFields(): MeasurementField[];
     protected getCastedMeasurement(measurement: Measurement): T;
     generateValues(measurement: Measurement): ObservationValue[];
     getObservationCodes(): CodeableConcept[];

package/dist/client/observation/services/base-observation-service.js

@@ -3,6 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseObservationService = void 0;
 const fhir_systems_1 = require("../fhir-systems");
 class BaseObservationService {
+    getFields() {
+        return this.observationMetadata.map(({ valueKey, primaryCode, unit, toFixed, display }) => ({
+            key: String(valueKey),
+            code: primaryCode,
+            unit,
+            decimals: toFixed,
+            display,
+        }));
+    }
     getCastedMeasurement(measurement) {
         if (measurement.measurementTypeKey !== this.measurementTypeKey) {
             throw new Error(`Measurement is not a ${this.measurementTypeName} measurement`);

package/dist/client/observation/services/creator.d.ts

@@ -5,5 +5,7 @@ export declare class ObservationServiceCreator {
     private readonly services;
     private constructor();
     static getInstance(): ObservationServiceCreator;
+    /** The measurement types the SDK turns into Observations. */
+    getTypes(): MeasurementTypeKey[];
     getService(type: MeasurementTypeKey): IObservationService;
 }

package/dist/client/observation/services/creator.js

@@ -32,6 +32,10 @@ class ObservationServiceCreator {
         }
         return ObservationServiceCreator.instance;
     }
+    /** The measurement types the SDK turns into Observations. */
+    getTypes() {
+        return [...this.services.keys()];
+    }
     getService(type) {
         const service = this.services.get(type);
         if (!service) {

package/dist/client/observation/types/IObservationService.d.ts

@@ -4,12 +4,15 @@ import { Sample } from "./generate-measurement/Sample";
 import { ObservationFragment } from "./generate-observation-body/ObservationFragment";
 import { ObservationValue } from "./generate-observation-body/ObservationValue";
 import { Measurement } from "./measurement/Measurement";
+import { MeasurementField } from "./service/MeasurementField";
 export interface IObservationService {
     generateValues: (measurement: Measurement) => ObservationValue[];
     generateObservationFragments?: (measurement: Measurement) => ObservationFragment[];
     getObservationCodes: () => CodeableConcept[];
     getAdditionalProperties: (measurement: Measurement) => Partial<Observation>[];
     getUnits: () => string[];
+    /** The measurement's properties as their Observations store them; the first is the main one. */
+    getFields: () => MeasurementField[];
     getMeasurementDisplay: (measurement: Measurement) => string;
     getObservationDisplay: (observations: Observation[]) => string | undefined;
     convertSamplesToMeasurement: (samples: Sample[]) => Measurement;

package/dist/client/observation/types/service/MeasurementField.d.ts

@@ -0,0 +1,11 @@
+/** One property of a measurement, as its Observation stores it. */
+export type MeasurementField = {
+    /** The property on the measurement: `systolic`, `bloodGlucose`, … */
+    key: string;
+    /** The code (LOINC) of the Observation that carries it. */
+    code: string;
+    unit: string;
+    /** The decimal places the SDK keeps when it writes the value. */
+    decimals: number;
+    display: string;
+};

package/dist/client/observation/types/service/MeasurementField.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/client/ovok-client.d.ts

@@ -50,6 +50,8 @@ export declare class OvokClient extends MedplumClient {
     private readonly keepSessionOnRefreshUnavailable;
     private readonly refreshState;
     private offlineMeasurementQueue;
+    private profileRetry;
+    private profileRetryMs;
     /**
      * @param config - The configuration for the client.
      * @param config.socialLoginClientId - The social login client id to use for the client.
@@ -57,6 +59,12 @@ export declare class OvokClient extends MedplumClient {
     constructor(config: OvokClientOptions);
     get<T = unknown>(url: URL | string, options?: MedplumRequestOptions): ReadablePromise<T>;
     refreshIfExpired(gracePeriod?: number): Promise<void>;
+    /** A profile load that failed is tried again now, rather than answering with its old error. */
+    getProfileAsync(): ReturnType<MedplumClient["getProfileAsync"]>;
+    clearActiveLogin(): void;
+    /** While signed in without a profile, a failed load is tried again: after 2 s, doubling to a minute. */
+    private retryProfileOnFailure;
+    private cancelProfileRetry;
     post<T = unknown>(url: URL | string, body?: unknown, contentType?: string, options?: MedplumRequestOptions): Promise<T>;
     /** Lists saved accounts without exposing their access or refresh tokens. */
     getSavedAccounts(): OvokSavedAccount[];

package/dist/client/ovok-client.js

@@ -69,6 +69,9 @@ var observation_bundle_utils_2 = require("./observation/observation-bundle-utils
 Object.defineProperty(exports, "MAX_CONDITIONAL_OBSERVATION_ENTRIES", { enumerable: true, get: function () { return observation_bundle_utils_2.MAX_CONDITIONAL_OBSERVATION_ENTRIES; } });
 Object.defineProperty(exports, "MAX_OBSERVATION_BUNDLE_BYTES", { enumerable: true, get: function () { return observation_bundle_utils_2.MAX_OBSERVATION_BUNDLE_BYTES; } });
 const isRetrySafePost = (pathname) => pathname === "/ai/fhir/search";
+/** A failed profile load is tried again after this long, doubling up to the maximum. */
+const PROFILE_RETRY_MS = 2000;
+const PROFILE_RETRY_MAX_MS = 60000;
 class OvokClient extends core_1.MedplumClient {
     /**
      * @param config - The configuration for the client.
@@ -92,7 +95,22 @@ class OvokClient extends core_1.MedplumClient {
             fetch: session.fetch,
         });
         this.socialLoginClientId = "";
+        this.profileRetryMs = PROFILE_RETRY_MS;
         session.setClearActiveLogin(this.clearActiveLogin.bind(this));
+        // Medplum keeps a failed `auth/me` as the profile for good: `isLoading()` stays true and `getProfileAsync()`
+        // keeps rejecting. So a failed load is tried again while signed in.
+        const loader = this;
+        const refreshProfile = loader.refreshProfile.bind(this);
+        loader.refreshProfile = () => {
+            this.cancelProfileRetry();
+            const loading = refreshProfile();
+            this.retryProfileOnFailure(loading);
+            return loading;
+        };
+        // A saved session resumed inside super() started loading before the retry existed.
+        if (loader.profilePromise) {
+            this.retryProfileOnFailure(loader.profilePromise);
+        }
         this.hasExplicitStorageAdapter = config.storage !== undefined;
         this.clientOptions = config;
         this.keepSessionOnRefreshUnavailable = config.keepSessionOnRefreshUnavailable === true;
@@ -131,7 +149,6 @@ class OvokClient extends core_1.MedplumClient {
         return request;
     }
     async refreshIfExpired(gracePeriod) {
-        var _a;
         const activeLogin = this.getActiveLogin();
         const accessToken = this.getAccessToken();
         const expiresAt = accessToken ? (0, core_1.tryGetJwtExpiration)(accessToken) : undefined;
@@ -147,9 +164,7 @@ class OvokClient extends core_1.MedplumClient {
                 !(activeAccount === null || activeAccount === void 0 ? void 0 : activeAccount.expired) &&
                 expiresAt !== undefined &&
                 expiresAt > Date.now()) {
-                (_a = this.clientStorage) === null || _a === void 0 ? void 0 : _a.setObject(account_storage_1.ACTIVE_LOGIN_STORAGE_KEY, activeLogin);
-                this.setAccessToken(accessToken, activeLogin.refreshToken);
-                return;
+                return; // the still-valid access token carries the request
             }
             throw error;
         }
@@ -157,6 +172,37 @@ class OvokClient extends core_1.MedplumClient {
             this.refreshState.unavailable = false;
         }
     }
+    /** A profile load that failed is tried again now, rather than answering with its old error. */
+    getProfileAsync() {
+        return this.profileRetry
+            ? this.refreshProfile()
+            : super.getProfileAsync();
+    }
+    clearActiveLogin() {
+        this.cancelProfileRetry();
+        super.clearActiveLogin();
+    }
+    /** While signed in without a profile, a failed load is tried again: after 2 s, doubling to a minute. */
+    retryProfileOnFailure(loading) {
+        loading.then(() => {
+            this.profileRetryMs = PROFILE_RETRY_MS;
+        }, () => {
+            var _a, _b;
+            if (!this.getActiveLogin() || this.getProfile()) {
+                return;
+            }
+            const retry = setTimeout(() => {
+                void this.refreshProfile().catch(() => undefined);
+            }, this.profileRetryMs);
+            (_b = (_a = retry).unref) === null || _b === void 0 ? void 0 : _b.call(_a); // never keeps a Node process alive
+            this.profileRetry = retry;
+            this.profileRetryMs = Math.min(this.profileRetryMs * 2, PROFILE_RETRY_MAX_MS);
+        });
+    }
+    cancelProfileRetry() {
+        clearTimeout(this.profileRetry);
+        this.profileRetry = undefined;
+    }
     post(url, body, contentType, options) {
         const pathname = new URL(url.toString(), this.getBaseUrl()).pathname;
         if (!isRetrySafePost(pathname)) {

package/dist/conformance/capability-requirements.js

@@ -48,7 +48,7 @@ exports.OVOK_CORE_REQUIREMENTS = {
     description: "The FHIR surface a server must provide for the @ovok/core client library's own methods to function.",
     software: {
         name: "@ovok/core",
-        version: "0.4.38",
+        version: "0.4.40",
     },
     fhirVersion: "4.0.1",
     format: ["json"],

package/dist/index.d.ts

@@ -940,6 +940,7 @@ export * from "./hooks";
 export * from "./utils";
 export * from "./client/observation/services";
 export * from "./client/observation/methods";
+export * from "./client/observation/measurement-fields";
 export { saveMeasurement } from "./client/observation/methods/saveMeasurement";
 export * from "./conformance/capability-requirements";
 export * from "./conformance/api-requirements";

package/dist/index.js

@@ -58,6 +58,7 @@ __exportStar(require("./hooks"), exports);
 __exportStar(require("./utils"), exports);
 __exportStar(require("./client/observation/services"), exports);
 __exportStar(require("./client/observation/methods"), exports);
+__exportStar(require("./client/observation/measurement-fields"), exports);
 var saveMeasurement_1 = require("./client/observation/methods/saveMeasurement");
 Object.defineProperty(exports, "saveMeasurement", { enumerable: true, get: function () { return saveMeasurement_1.saveMeasurement; } });
 __exportStar(require("./conformance/capability-requirements"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ovok/core",
-  "version": "0.4.38",
+  "version": "0.4.40",
   "private": false,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",