@ovok/core 0.4.36 → 0.4.37

package/dist/client/observation/services/single-value-services.d.ts

@@ -0,0 +1,31 @@
+import { MeasurementTypeKey } from "../../../types";
+import { RecordResult, RecordType } from "../types/generate-measurement/HealthConnectTypes";
+import { Sample } from "../types/generate-measurement/Sample";
+import { Measurement } from "../types/measurement/Measurement";
+import { ObservationMetadata } from "../types/service/ObservationMetadata";
+/** A measurement whose one value sits under the spec's `valueKey`. */
+type SingleValueMeasurement = Measurement & {
+    [value: string]: unknown;
+};
+import { BaseObservationService } from "./base-observation-service";
+type SingleValueSpec = {
+    measurementTypeKey: MeasurementTypeKey;
+    measurementTypeName: string;
+    metadata: Omit<ObservationMetadata<SingleValueMeasurement>, "additionalCodes">;
+    /** HealthKit quantity type to read; the first sample is used when omitted. */
+    sampleType?: string;
+    fromRecord: (record: RecordResult<RecordType>) => number | undefined;
+};
+/** An observation with one value: what varies per measurement is data, not code. */
+declare class SingleValueObservationService extends BaseObservationService<SingleValueMeasurement> {
+    private readonly spec;
+    protected measurementTypeKey: MeasurementTypeKey;
+    protected measurementTypeName: string;
+    protected observationMetadata: ObservationMetadata<SingleValueMeasurement>[];
+    constructor(spec: SingleValueSpec);
+    convertSamplesToMeasurement(samples: Sample[]): SingleValueMeasurement;
+    convertRecordToMeasurement(record: RecordResult<RecordType>): SingleValueMeasurement;
+    private measurement;
+}
+export declare const singleValueObservationServices: () => [MeasurementTypeKey, SingleValueObservationService][];
+export {};

package/dist/client/observation/services/single-value-services.js

@@ -0,0 +1,95 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.singleValueObservationServices = void 0;
+const types_1 = require("../../../types");
+const base_observation_service_1 = require("./base-observation-service");
+/** An observation with one value: what varies per measurement is data, not code. */
+class SingleValueObservationService extends base_observation_service_1.BaseObservationService {
+    constructor(spec) {
+        super();
+        this.spec = spec;
+        this.measurementTypeKey = spec.measurementTypeKey;
+        this.measurementTypeName = spec.measurementTypeName;
+        this.observationMetadata = [{ ...spec.metadata, additionalCodes: [] }];
+    }
+    convertSamplesToMeasurement(samples) {
+        const sample = this.spec.sampleType
+            ? samples.find((x) => x.quantityType === this.spec.sampleType)
+            : samples[0];
+        return this.measurement(sample === null || sample === void 0 ? void 0 : sample.quantity);
+    }
+    convertRecordToMeasurement(record) {
+        return this.measurement(this.spec.fromRecord(record));
+    }
+    measurement(value) {
+        return {
+            [this.spec.metadata.valueKey]: value,
+            measurementTypeKey: this.measurementTypeKey,
+        };
+    }
+}
+const specs = [
+    {
+        measurementTypeKey: types_1.MeasurementTypeKey.bloodGlucose,
+        measurementTypeName: "blood glucose",
+        metadata: { primaryCode: types_1.ObservationCode.BLOOD_GLUCOSE, display: "Blood Glucose", unit: "mg/dL", valueKey: "bloodGlucose", toFixed: 1 },
+        fromRecord: (record) => record.level.inMilligramsPerDeciliter,
+    },
+    {
+        measurementTypeKey: types_1.MeasurementTypeKey.temperature,
+        measurementTypeName: "body temperature",
+        metadata: { primaryCode: types_1.ObservationCode.BODY_TEMPERATURE, display: "Body Temperature", unit: "°C", valueKey: "bodyTemp", toFixed: 2 },
+        fromRecord: (record) => record.temperature.inCelsius,
+    },
+    {
+        measurementTypeKey: types_1.MeasurementTypeKey.bodyWeight,
+        measurementTypeName: "body weight",
+        metadata: { primaryCode: types_1.ObservationCode.BODY_WEIGHT, display: "Body Weight", unit: "kg", valueKey: "bodyWeight", toFixed: 2 },
+        fromRecord: (record) => record.weight.inKilograms,
+    },
+    {
+        measurementTypeKey: types_1.MeasurementTypeKey.heartRateVariability,
+        measurementTypeName: "heart rate variability",
+        metadata: { primaryCode: types_1.ObservationCode.HEART_RATE_VARIABILITY, display: "Heart Rate Variability", unit: "ms", valueKey: "heartRateVariability", toFixed: 1 },
+        sampleType: "HKQuantityTypeIdentifierHeartRateVariabilitySDNN",
+        fromRecord: (record) => record.heartRateVariabilityMillis,
+    },
+    {
+        measurementTypeKey: types_1.MeasurementTypeKey.heartRate,
+        measurementTypeName: "heart rate",
+        metadata: { primaryCode: types_1.ObservationCode.HEART_RATE, display: "Heart Rate", unit: "bpm", valueKey: "heartRate", toFixed: 0 },
+        sampleType: "HKQuantityTypeIdentifierHeartRate",
+        fromRecord: (record) => { var _a, _b; return (_b = (_a = record.samples) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.beatsPerMinute; },
+    },
+    {
+        measurementTypeKey: types_1.MeasurementTypeKey.respiratoryRate,
+        measurementTypeName: "respiratory rate",
+        metadata: { primaryCode: types_1.ObservationCode.RESPIRATORY_RATE, display: "Respiratory Rate", unit: "breaths/min", valueKey: "respiratoryRate", toFixed: 1 },
+        sampleType: "HKQuantityTypeIdentifierRespiratoryRate",
+        fromRecord: (record) => record.rate,
+    },
+    {
+        measurementTypeKey: types_1.MeasurementTypeKey.restingHeartRate,
+        measurementTypeName: "resting heart rate",
+        metadata: { primaryCode: types_1.ObservationCode.RESTING_HEART_RATE, display: "Resting Heart Rate", unit: "bpm", valueKey: "restingHeartRate", toFixed: 0 },
+        sampleType: "HKQuantityTypeIdentifierRestingHeartRate",
+        fromRecord: (record) => record.beatsPerMinute,
+    },
+    {
+        measurementTypeKey: types_1.MeasurementTypeKey.vo2Max,
+        measurementTypeName: "VO2 max",
+        metadata: { primaryCode: types_1.ObservationCode.VO2_MAX, display: "VO2 Max", unit: "mL/kg/min", valueKey: "vo2Max", toFixed: 1 },
+        sampleType: "HKQuantityTypeIdentifierVO2Max",
+        fromRecord: (record) => record.vo2MillilitersPerMinuteKilogram,
+    },
+    {
+        measurementTypeKey: types_1.MeasurementTypeKey.walkingHeartRateAverage,
+        measurementTypeName: "walking heart rate average",
+        metadata: { primaryCode: types_1.ObservationCode.WALKING_HEART_RATE_AVERAGE, display: "Walking Heart Rate Average", unit: "bpm", valueKey: "walkingHeartRateAverage", toFixed: 0 },
+        sampleType: "HKQuantityTypeIdentifierWalkingHeartRateAverage",
+        // Health Connect has no walking-heart-rate-average record.
+        fromRecord: () => 0,
+    },
+];
+const singleValueObservationServices = () => specs.map((spec) => [spec.measurementTypeKey, new SingleValueObservationService(spec)]);
+exports.singleValueObservationServices = singleValueObservationServices;

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

@@ -3,6 +3,7 @@ import { Bundle, CapabilityStatement, Observation } from "@medplum/fhirtypes";
 import { OvokPublicApiEndpoint } from "../conformance/capability";
 import * as aiFhirMethods from "./ai-fhir/methods";
 import * as authMethods from "./auth/methods";
+import { OvokUnauthenticatedReason } from "./auth/session-fetch";
 import { OvokSavedAccount } from "./auth/types/Account";
 import * as botMethods from "./bot/methods";
 import * as changeHistoryMethods from "./change-history/methods";
@@ -24,6 +25,7 @@ import * as signalsMethods from "./signals/methods";
 import * as slimMethods from "./slim/methods";
 export declare const MAX_CONDITIONAL_OBSERVATION_ENTRIES = 8;
 export { MAX_OBSERVATION_BUNDLE_BYTES } from "./observation/observation-bundle-utils";
+export type { OvokUnauthenticatedReason } from "./auth/session-fetch";
 export type SaveObservationsResult = {
     status: "saved";
     response: Bundle;
@@ -32,19 +34,6 @@ export type SaveObservationsResult = {
     queueId: string;
 };
 export type OvokFhirVersion = "R4" | "R5";
-export type OvokUnauthenticatedReason = {
-    type: "refresh-rejected";
-    status: 400 | 401 | 403;
-} | {
-    type: "refresh-unavailable";
-    status?: number;
-} | {
-    type: "authentication-rejected";
-    status: number;
-} | {
-    type: "request-unauthorized";
-    status: 401;
-};
 export type OvokClientOptions = Omit<MedplumClientOptions, "onUnauthenticated"> & {
     onUnauthenticated?: (reason: OvokUnauthenticatedReason) => void;
     socialLoginClientId?: string;

package/dist/client/ovok-client.js

@@ -41,6 +41,8 @@ const aiFhirMethods = __importStar(require("./ai-fhir/methods"));
 const account_storage_1 = require("./auth/account-storage");
 const errors_1 = require("./auth/errors");
 const authMethods = __importStar(require("./auth/methods"));
+const session_fetch_1 = require("./auth/session-fetch");
+const session_http_1 = require("./auth/session-http");
 const botMethods = __importStar(require("./bot/methods"));
 const changeHistoryMethods = __importStar(require("./change-history/methods"));
 const aiMethods = __importStar(require("./chat/ai/methods"));
@@ -48,7 +50,6 @@ const cmsMethods = __importStar(require("./cms/methods"));
 const consentMethods = __importStar(require("./consent/methods"));
 const emailMethods = __importStar(require("./email"));
 const ovok_error_1 = require("./errors/ovok-error");
-const ovok_error_utils_1 = require("./errors/ovok-error-utils");
 const rate_limit_error_1 = require("./errors/rate-limit-error");
 const experienceMethods = __importStar(require("./experience/methods"));
 const inviteMethods = __importStar(require("./invites/methods"));
@@ -66,138 +67,6 @@ const slimMethods = __importStar(require("./slim/methods"));
 exports.MAX_CONDITIONAL_OBSERVATION_ENTRIES = 8;
 var observation_bundle_utils_2 = require("./observation/observation-bundle-utils");
 Object.defineProperty(exports, "MAX_OBSERVATION_BUNDLE_BYTES", { enumerable: true, get: function () { return observation_bundle_utils_2.MAX_OBSERVATION_BUNDLE_BYTES; } });
-const retryAfterMs = (response) => {
-    var _a, _b;
-    const value = (_b = (_a = response.headers) === null || _a === void 0 ? void 0 : _a.get) === null || _b === void 0 ? void 0 : _b.call(_a, "Retry-After");
-    if (!value) {
-        return undefined;
-    }
-    const seconds = Number(value);
-    if (Number.isFinite(seconds)) {
-        return Math.max(0, seconds * 1000);
-    }
-    const date = Date.parse(value);
-    return Number.isFinite(date) ? Math.max(0, date - Date.now()) : undefined;
-};
-const timeoutError = () => {
-    const error = new Error("The request timed out.");
-    error.name = "TimeoutError";
-    return error;
-};
-const withHttpErrorMetadata = async (response) => {
-    var _a, _b;
-    if (response.ok || typeof response.clone !== "function") {
-        return response;
-    }
-    let bodyText = "";
-    let body;
-    try {
-        bodyText = await response.clone().text();
-        body = JSON.parse(bodyText);
-    }
-    catch (_c) {
-        body = undefined;
-    }
-    const outcome = body && typeof body === "object" && body.resourceType === "OperationOutcome"
-        ? body
-        : undefined;
-    const envelope = body && typeof body === "object" ? body : undefined;
-    const nestedError = (envelope === null || envelope === void 0 ? void 0 : envelope.error) && typeof envelope.error === "object"
-        ? envelope.error
-        : undefined;
-    const safeResponse = envelope
-        ? Object.fromEntries(Object.entries(envelope).filter(([key]) => ["code", "error", "message", "requestId", "retryAfterSec", "status", "statusCode", "errors", "missing"].includes(key)))
-        : { message: typeof body === "string" ? body : response.statusText };
-    const status = response.status;
-    const retryAfter = (_a = retryAfterMs(response)) !== null && _a !== void 0 ? _a : (typeof (envelope === null || envelope === void 0 ? void 0 : envelope.retryAfterSec) === "number" ? envelope.retryAfterSec * 1000 : undefined);
-    const requestId = (_b = response.headers.get("x-request-id")) !== null && _b !== void 0 ? _b : (typeof (envelope === null || envelope === void 0 ? void 0 : envelope.requestId) === "string" ? envelope.requestId : undefined);
-    const message = typeof (envelope === null || envelope === void 0 ? void 0 : envelope.message) === "string"
-        ? envelope.message
-        : typeof (nestedError === null || nestedError === void 0 ? void 0 : nestedError.message) === "string"
-            ? nestedError.message
-            : response.statusText || `HTTP ${status}`;
-    const extensions = [];
-    const addMetadata = (url, value, kind) => {
-        if (value !== undefined) {
-            extensions.push({ url, [`value${kind}`]: value });
-        }
-    };
-    addMetadata("status", status, "Integer");
-    addMetadata("requestId", requestId, "String");
-    addMetadata("retryAfterMs", retryAfter, "Integer");
-    if (!outcome) {
-        extensions.push({ url: "response", valueString: JSON.stringify(safeResponse) });
-    }
-    const enrichedOutcome = outcome !== null && outcome !== void 0 ? outcome : {
-        resourceType: "OperationOutcome",
-        id: "ovok-http-error",
-        issue: [{
-                severity: "error",
-                code: status === 429 ? "throttled" : "exception",
-                details: { text: bodyText || message },
-            }],
-    };
-    const existingExtensions = Array.isArray(enrichedOutcome.extension)
-        ? enrichedOutcome.extension
-        : [];
-    enrichedOutcome.extension = [
-        ...existingExtensions,
-        { url: ovok_error_utils_1.OVOK_HTTP_ERROR_EXTENSION_URL, extension: extensions },
-    ];
-    const headers = new Headers(response.headers);
-    headers.delete("content-length");
-    headers.set("content-type", "application/fhir+json");
-    return new Response(JSON.stringify(enrichedOutcome), {
-        status,
-        statusText: response.statusText,
-        headers,
-    });
-};
-const waitForRetry = (milliseconds, signal) => new Promise((resolve, reject) => {
-    var _a;
-    if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
-        const error = new Error("Token refresh aborted");
-        error.name = "AbortError";
-        reject((_a = signal.reason) !== null && _a !== void 0 ? _a : error);
-        return;
-    }
-    const timer = setTimeout(() => {
-        signal === null || signal === void 0 ? void 0 : signal.removeEventListener("abort", abort);
-        resolve();
-    }, milliseconds);
-    const abort = () => {
-        var _a;
-        clearTimeout(timer);
-        const error = new Error("Token refresh aborted");
-        error.name = "AbortError";
-        reject((_a = signal === null || signal === void 0 ? void 0 : signal.reason) !== null && _a !== void 0 ? _a : error);
-    };
-    signal === null || signal === void 0 ? void 0 : signal.addEventListener("abort", abort, { once: true });
-});
-const isTemporaryRefreshFailure = (status) => status === 429 || (status >= 500 && status <= 599);
-const refreshUnavailableError = (response) => {
-    const error = new Error("Token refresh is temporarily unavailable");
-    error.name = "NetworkError";
-    Object.assign(error, { cause: response });
-    return error;
-};
-const refreshResponseError = (response) => {
-    const error = new Error(`Token refresh returned HTTP ${response.status}`);
-    error.name = "TokenRefreshError";
-    Object.assign(error, { status: response.status, cause: response });
-    return error;
-};
-const isNetworkError = (error) => {
-    if (!(error instanceof Error)) {
-        return false;
-    }
-    if (error.name === "NetworkError" ||
-        error.name === "UnknownHostException" ||
-        /network request failed|failed to fetch|load failed|unknownhostexception|econn|enotfound/i.test(error.message)) {
-        return true;
-    }
-    return isNetworkError(error.cause);
-};
 const isRetrySafePost = (pathname) => pathname === "/ai/fhir/search";
 class OvokClient extends core_1.MedplumClient {
     /**
@@ -214,236 +83,19 @@ class OvokClient extends core_1.MedplumClient {
         const baseUrl = (_c = config.baseUrl) !== null && _c !== void 0 ? _c : "https://api.medplum.com/";
         const normalizedBaseUrl = baseUrl.endsWith("/") ? baseUrl : `${baseUrl}/`;
         const tokenUrl = new URL((_d = config.tokenUrl) !== null && _d !== void 0 ? _d : "oauth2/token", normalizedBaseUrl).href;
-        let unauthenticatedReason;
-        let clearActiveLogin = () => undefined;
-        let terminalRefreshToken;
-        let terminalRefreshError;
-        const refreshState = { unavailable: false };
-        const isTokenRefresh = (url, options) => new URL(url, normalizedBaseUrl).href === tokenUrl &&
-            (options === null || options === void 0 ? void 0 : options.method) === "POST" &&
-            typeof options.body === "string" &&
-            new URLSearchParams(options.body).get("grant_type") === "refresh_token";
-        const markActiveAccountExpired = () => {
-            var _a, _b;
-            const accountId = (_b = (_a = storage.getObject("activeLogin")) === null || _a === void 0 ? void 0 : _a.profile) === null || _b === void 0 ? void 0 : _b.reference;
-            if (accountId) {
-                (0, account_storage_1.setStoredAccountExpired)(storage, accountId, true);
-            }
-        };
-        const fetchOnce = async (url, options) => {
-            var _a, _b;
-            const requestTimeoutMs = config.requestTimeoutMs;
-            let response;
-            if (requestTimeoutMs === undefined) {
-                response = await fetchImplementation(url, options);
-            }
-            else {
-                const controller = new AbortController();
-                const callerSignal = options === null || options === void 0 ? void 0 : options.signal;
-                let timedOut = false;
-                const abortFromCaller = () => controller.abort(callerSignal === null || callerSignal === void 0 ? void 0 : callerSignal.reason);
-                const timeout = setTimeout(() => {
-                    timedOut = true;
-                    controller.abort(timeoutError());
-                }, requestTimeoutMs);
-                if (callerSignal === null || callerSignal === void 0 ? void 0 : callerSignal.aborted) {
-                    abortFromCaller();
-                }
-                else {
-                    callerSignal === null || callerSignal === void 0 ? void 0 : callerSignal.addEventListener("abort", abortFromCaller, { once: true });
-                }
-                try {
-                    response = await fetchImplementation(url, { ...options, signal: controller.signal });
-                }
-                catch (error) {
-                    if (timedOut) {
-                        throw timeoutError();
-                    }
-                    throw error;
-                }
-                finally {
-                    clearTimeout(timeout);
-                    callerSignal === null || callerSignal === void 0 ? void 0 : callerSignal.removeEventListener("abort", abortFromCaller);
-                }
-            }
-            const requestUrl = new URL(url, normalizedBaseUrl);
-            if (isTokenRefresh(url, options)) {
-                if (response.status === 400) {
-                    let invalidGrant = false;
-                    try {
-                        invalidGrant = (await response.clone().json()).error === "invalid_grant";
-                    }
-                    catch (_c) {
-                        // Do not sign out unless the response confirms that the refresh token was revoked.
-                    }
-                    if (!invalidGrant) {
-                        throw refreshResponseError(response);
-                    }
-                }
-                if ([400, 401, 403].includes(response.status)) {
-                    unauthenticatedReason = {
-                        type: "refresh-rejected",
-                        status: response.status,
-                    };
-                    markActiveAccountExpired();
-                }
-                else if (response.ok) {
-                    const accountId = (_b = (_a = storage.getObject("activeLogin")) === null || _a === void 0 ? void 0 : _a.profile) === null || _b === void 0 ? void 0 : _b.reference;
-                    if (accountId) {
-                        (0, account_storage_1.setStoredAccountExpired)(storage, accountId, false);
-                    }
-                    unauthenticatedReason = undefined;
-                }
-            }
-            else if (requestUrl.href === tokenUrl && !response.ok) {
-                unauthenticatedReason = {
-                    type: "authentication-rejected",
-                    status: response.status,
-                };
-            }
-            else if (response.status === 401) {
-                unauthenticatedReason = { type: "request-unauthorized", status: 401 };
-            }
-            return isTokenRefresh(url, options)
-                ? response
-                : withHttpErrorMetadata(response);
-        };
-        const fetchWithRefreshRetry = async (url, options) => {
-            var _a, _b, _c, _d;
-            const requestUrl = new URL(url, normalizedBaseUrl);
-            if (!isTokenRefresh(url, options)) {
-                const response = await fetchOnce(url, options);
-                const sessionEnded = requestUrl.pathname.endsWith("/auth/session/current") && response.status === 401;
-                if (sessionEnded) {
-                    markActiveAccountExpired();
-                }
-                return response;
-            }
-            const login = storage.getObject("activeLogin");
-            if (terminalRefreshError) {
-                if ((login === null || login === void 0 ? void 0 : login.accessToken) && login.accessToken !== terminalRefreshToken) {
-                    terminalRefreshToken = undefined;
-                    terminalRefreshError = undefined;
-                }
-                else {
-                    throw terminalRefreshError;
-                }
-            }
-            const expiresAt = (login === null || login === void 0 ? void 0 : login.accessToken) ? (0, core_1.tryGetJwtExpiration)(login.accessToken) : undefined;
-            const signal = options === null || options === void 0 ? void 0 : options.signal;
-            if (expiresAt !== undefined && options) {
-                const tokenRequestOptions = options;
-                tokenRequestOptions.maxRetries = 0;
-                tokenRequestOptions.maxRetryTime = 0;
-            }
-            if (expiresAt === undefined) {
-                const response = await fetchOnce(url, options);
-                if (isTemporaryRefreshFailure(response.status)) {
-                    void ((_a = response.body) === null || _a === void 0 ? void 0 : _a.cancel().catch(() => undefined));
-                    if (config.keepSessionOnRefreshUnavailable) {
-                        refreshState.unavailable = true;
-                    }
-                    throw refreshUnavailableError(response);
-                }
-                return response;
-            }
-            let attempt = 0;
-            let firstAttempt = true;
-            let lastResponse;
-            let lastNetworkError;
-            while (firstAttempt || Date.now() < expiresAt) {
-                firstAttempt = false;
-                try {
-                    lastResponse = await fetchOnce(url, options);
-                }
-                catch (error) {
-                    if ((signal === null || signal === void 0 ? void 0 : signal.aborted) || !isNetworkError(error)) {
-                        throw error;
-                    }
-                    if (config.keepSessionOnRefreshUnavailable) {
-                        refreshState.unavailable = true;
-                        lastNetworkError = error;
-                        break;
-                    }
-                    if (Date.now() >= expiresAt) {
-                        lastNetworkError = error;
-                        break;
-                    }
-                    lastNetworkError = error;
-                    const remainingMs = expiresAt - Date.now();
-                    const backoffMs = Math.min(500 * (2 ** Math.min(attempt, 6)), 30000);
-                    await waitForRetry(Math.min(backoffMs, remainingMs), signal);
-                    attempt += 1;
-                    continue;
-                }
-                if (!isTemporaryRefreshFailure(lastResponse.status)) {
-                    return lastResponse;
-                }
-                if (config.keepSessionOnRefreshUnavailable) {
-                    refreshState.unavailable = true;
-                    break;
-                }
-                const remainingMs = expiresAt - Date.now();
-                if (remainingMs <= 0) {
-                    break;
-                }
-                const backoffMs = Math.min(500 * (2 ** Math.min(attempt, 6)), 30000);
-                const waitMs = Math.min(Math.max((_b = retryAfterMs(lastResponse)) !== null && _b !== void 0 ? _b : 0, backoffMs), remainingMs);
-                if (waitMs >= remainingMs) {
-                    await waitForRetry(remainingMs, signal);
-                    break;
-                }
-                void ((_c = lastResponse.body) === null || _c === void 0 ? void 0 : _c.cancel().catch(() => undefined));
-                await waitForRetry(waitMs, signal);
-                attempt += 1;
-            }
-            const status = lastResponse === null || lastResponse === void 0 ? void 0 : lastResponse.status;
-            const reason = {
-                type: "refresh-unavailable",
-                ...(status === undefined ? {} : { status }),
-            };
-            if (config.keepSessionOnRefreshUnavailable) {
-                refreshState.unavailable = true;
-                if (lastResponse) {
-                    return lastResponse;
-                }
-                throw lastNetworkError !== null && lastNetworkError !== void 0 ? lastNetworkError : refreshUnavailableError(undefined);
-            }
-            unauthenticatedReason = reason;
-            markActiveAccountExpired();
-            if (lastResponse) {
-                return lastResponse;
-            }
-            terminalRefreshToken = login === null || login === void 0 ? void 0 : login.accessToken;
-            terminalRefreshError = lastNetworkError !== null && lastNetworkError !== void 0 ? lastNetworkError : refreshUnavailableError(undefined);
-            clearActiveLogin();
-            (_d = config.onUnauthenticated) === null || _d === void 0 ? void 0 : _d.call(config, reason);
-            unauthenticatedReason = undefined;
-            throw terminalRefreshError;
-        };
+        const session = (0, session_fetch_1.createSessionFetch)({ config, storage, fetchImplementation, normalizedBaseUrl, tokenUrl });
         super({
             ...config,
             storage,
-            onUnauthenticated: () => {
-                var _a;
-                if (refreshState.unavailable) {
-                    return;
-                }
-                const reason = unauthenticatedReason !== null && unauthenticatedReason !== void 0 ? unauthenticatedReason : {
-                    type: "request-unauthorized",
-                    status: 401,
-                };
-                unauthenticatedReason = undefined;
-                (_a = config.onUnauthenticated) === null || _a === void 0 ? void 0 : _a.call(config, reason);
-            },
-            fetch: fetchWithRefreshRetry,
+            onUnauthenticated: session.onUnauthenticated,
+            fetch: session.fetch,
         });
         this.socialLoginClientId = "";
-        clearActiveLogin = this.clearActiveLogin.bind(this);
+        session.setClearActiveLogin(this.clearActiveLogin.bind(this));
         this.hasExplicitStorageAdapter = config.storage !== undefined;
         this.clientOptions = config;
         this.keepSessionOnRefreshUnavailable = config.keepSessionOnRefreshUnavailable === true;
-        this.refreshState = refreshState;
+        this.refreshState = session.refreshState;
         this.socialLoginClientId = (_e = config.socialLoginClientId) !== null && _e !== void 0 ? _e : "";
         this.addEventListener("profileRefreshed", () => this.syncSavedAccountProfile());
         this.bindMethods(authMethods);
@@ -546,7 +198,7 @@ class OvokClient extends core_1.MedplumClient {
         }
         catch (error) {
             const activeLogin = this.getActiveLogin();
-            if (((_a = activeLogin === null || activeLogin === void 0 ? void 0 : activeLogin.profile) === null || _a === void 0 ? void 0 : _a.reference) === accountId && isNetworkError(error)) {
+            if (((_a = activeLogin === null || activeLogin === void 0 ? void 0 : activeLogin.profile) === null || _a === void 0 ? void 0 : _a.reference) === accountId && (0, session_http_1.isNetworkError)(error)) {
                 return;
             }
             if (!activeLogin &&

package/dist/client/patient/methods.js

@@ -21,22 +21,13 @@ exports.getPatientDevice = getPatientDevice;
 exports.listPatientNotifications = listPatientNotifications;
 exports.getPatientNotification = getPatientNotification;
 exports.getPatientDashboard = getPatientDashboard;
-const query = (params) => {
-    const values = new URLSearchParams();
-    for (const [key, value] of Object.entries(params)) {
-        if (value !== undefined) {
-            values.set(key, String(value));
-        }
-    }
-    const encoded = values.toString();
-    return encoded === "" ? "" : `?${encoded}`;
-};
+const query_string_1 = require("../query-string");
 async function getCurrentPatientProfile(requestOptions) {
     return this.get("/auth/me", ...(requestOptions === undefined ? [] : [requestOptions]));
 }
 async function getPatientLatestObservations(params = {}, requestOptions) {
     const code = Array.isArray(params.code) ? params.code.join(",") : params.code;
-    return this.get(`/fhir/Observation/$lastn${query({
+    return this.get(`/fhir/Observation/$lastn${(0, query_string_1.toQueryString)({
         patient: params.patient,
         max: params.max,
         code,

package/dist/client/patient-sharing/methods.js

@@ -6,7 +6,6 @@ exports.listPatientSharing = listPatientSharing;
 exports.revokePatientSharing = revokePatientSharing;
 exports.getPatientSharingSettings = getPatientSharingSettings;
 exports.updatePatientSharingSettings = updatePatientSharingSettings;
-const segment = (value) => encodeURIComponent(value);
 function createPatientSharingInvite(body, requestOptions) {
     return this.post("/v1/patient-sharing/invites", body, undefined, requestOptions);
 }
@@ -26,7 +25,7 @@ function listPatientSharing(requestOptions) {
     });
 }
 async function revokePatientSharing(consentId, requestOptions) {
-    await this.delete(`/v1/patient-sharing/shares/${segment(consentId)}`, ...(requestOptions === undefined ? [] : [requestOptions]));
+    await this.delete(`/v1/patient-sharing/shares/${encodeURIComponent(consentId)}`, ...(requestOptions === undefined ? [] : [requestOptions]));
     this.invalidateUrl("/v1/patient-sharing/shares");
 }
 function getPatientSharingSettings(requestOptions) {