@ovok/core 0.4.36 → 0.4.38

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"));
@@ -60,144 +61,13 @@ const patientMethods = __importStar(require("./patient/methods"));
 const patientSharingMethods = __importStar(require("./patient-sharing/methods"));
 const platformMethods = __importStar(require("./platform/methods"));
 const questionnaireResponseMethods = __importStar(require("./questionnaire-response/methods"));
+const request_options_1 = require("./request-options");
 const errors_2 = require("./signals/errors");
 const signalsMethods = __importStar(require("./signals/methods"));
 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_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 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 +84,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);
@@ -494,7 +147,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("activeLogin", activeLogin);
+                (_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;
             }
@@ -546,7 +199,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 &&
@@ -573,7 +226,7 @@ class OvokClient extends core_1.MedplumClient {
         const wasActive = previousAccountId === accountId;
         const sessionClient = this.createAccountSessionClient(login);
         try {
-            await sessionClient.delete("auth/session/current", ...(requestOptions === undefined ? [] : [requestOptions]));
+            await sessionClient.delete("auth/session/current", ...(0, request_options_1.optionalArg)(requestOptions));
         }
         catch (error) {
             if (!sessionClient.getSavedAccounts().some((account) => account.id === accountId && account.expired)) {
@@ -601,14 +254,7 @@ class OvokClient extends core_1.MedplumClient {
     }
     /** Removes every saved account and expiry marker from client storage. */
     clearAllAccounts() {
-        var _a;
-        const storage = this.clientStorage;
-        const queueKey = (_a = this.offlineQueueOptions.storageKey) !== null && _a !== void 0 ? _a : offline_1.OFFLINE_MEASUREMENT_QUEUE_STORAGE_KEY;
-        const queuedMeasurements = storage === null || storage === void 0 ? void 0 : storage.getObject(queueKey);
-        super.clear();
-        if (Array.isArray(queuedMeasurements)) {
-            storage === null || storage === void 0 ? void 0 : storage.setObject(queueKey, queuedMeasurements);
-        }
+        this.clearKeepingQueue();
     }
     /** Reauthentication clears the expired marker for the account that signed in. */
     async setActiveLogin(login) {
@@ -622,22 +268,22 @@ class OvokClient extends core_1.MedplumClient {
     /** Saves a measurement immediately, or durably queues it when the opt-in queue is enabled. */
     async saveMeasurement(params, requestOptions) {
         const observations = await this.generateObservationBodiesByMeasurement(params);
-        return this.saveObservations(observations, ...(requestOptions === undefined ? [] : [requestOptions]));
+        return this.saveObservations(observations, ...(0, request_options_1.optionalArg)(requestOptions));
     }
     /** Reads Ovok's composed FHIR and public-route capability statement. */
     async getCapabilityStatement(version = "R4", requestOptions) {
-        return this.get(`/fhir/${version}/metadata`, ...(requestOptions === undefined ? [] : [requestOptions]));
+        return this.get(`/fhir/${version}/metadata`, ...(0, request_options_1.optionalArg)(requestOptions));
     }
     /** Returns the non-FHIR public routes published by the backend statement. */
     async getPublicApiEndpoints(version = "R4", requestOptions) {
-        return (0, capability_1.getOvokPublicApiEndpoints)(await this.getCapabilityStatement(version, ...(requestOptions === undefined ? [] : [requestOptions])));
+        return (0, capability_1.getOvokPublicApiEndpoints)(await this.getCapabilityStatement(version, ...(0, request_options_1.optionalArg)(requestOptions)));
     }
     /** Saves observations with conditional creates so a retry cannot create a duplicate. */
     async saveObservations(observations, requestOptions) {
         const linkedObservations = (0, observation_bundle_utils_1.linkObservationMembers)(observations);
         const queue = this.getOfflineMeasurementQueue();
         if (queue) {
-            const { id, flush } = await queue.enqueueAndFlush(linkedObservations, ...(requestOptions === undefined ? [] : [requestOptions]));
+            const { id, flush } = await queue.enqueueAndFlush(linkedObservations, ...(0, request_options_1.optionalArg)(requestOptions));
             const response = flush.responses[id];
             return response
                 ? { status: "saved", response }
@@ -659,7 +305,7 @@ class OvokClient extends core_1.MedplumClient {
                 failures: {},
             };
         }
-        return queue.flush(options, ...(requestOptions === undefined ? [] : [requestOptions]));
+        return queue.flush(options, ...(0, request_options_1.optionalArg)(requestOptions));
     }
     getOfflineMeasurementQueue() {
         var _a;
@@ -669,31 +315,33 @@ class OvokClient extends core_1.MedplumClient {
         if (!this.clientStorage || !this.hasExplicitStorageAdapter) {
             throw new Error("Offline measurement queue requires a durable client storage adapter.");
         }
-        (_a = this.offlineMeasurementQueue) !== null && _a !== void 0 ? _a : (this.offlineMeasurementQueue = new offline_1.OfflineMeasurementQueue(this.clientStorage, (bundle, requestOptions) => this.executeObservationBundle(bundle, ...(requestOptions === undefined ? [] : [requestOptions])), {
+        (_a = this.offlineMeasurementQueue) !== null && _a !== void 0 ? _a : (this.offlineMeasurementQueue = new offline_1.OfflineMeasurementQueue(this.clientStorage, (bundle, requestOptions) => this.executeObservationBundle(bundle, ...(0, request_options_1.optionalArg)(requestOptions)), {
             ...this.offlineQueueOptions,
-            getOwnerKey: () => {
-                var _a, _b, _c;
-                const login = this.getActiveLogin();
-                const profileReference = (_a = login === null || login === void 0 ? void 0 : login.profile) === null || _a === void 0 ? void 0 : _a.reference;
-                if (!profileReference) {
-                    return undefined;
-                }
-                return [
-                    this.getBaseUrl(),
-                    (_c = (_b = login === null || login === void 0 ? void 0 : login.project) === null || _b === void 0 ? void 0 : _b.reference) !== null && _c !== void 0 ? _c : "",
-                    profileReference,
-                ].join("|");
-            },
+            getOwnerKey: () => this.offlineOwnerKey(),
         }));
         return this.offlineMeasurementQueue;
     }
+    /** Queued measurements belong to one account on one server and project. */
+    offlineOwnerKey() {
+        var _a, _b, _c;
+        const login = this.getActiveLogin();
+        const profileReference = (_a = login === null || login === void 0 ? void 0 : login.profile) === null || _a === void 0 ? void 0 : _a.reference;
+        if (!profileReference) {
+            return undefined;
+        }
+        return [
+            this.getBaseUrl(),
+            (_c = (_b = login === null || login === void 0 ? void 0 : login.project) === null || _b === void 0 ? void 0 : _b.reference) !== null && _c !== void 0 ? _c : "",
+            profileReference,
+        ].join("|");
+    }
     /**
      * Medplum clears its entire client storage after an unrecoverable 401. Keep
      * saved accounts (marking only the active one expired) and queued measurements.
      * Use clearAllAccounts() when the caller intends to remove all saved accounts.
      */
     clear() {
-        var _a, _b, _c;
+        var _a, _b;
         const storage = this.clientStorage;
         const activeAccountId = (_b = (_a = this.getActiveLogin()) === null || _a === void 0 ? void 0 : _a.profile) === null || _b === void 0 ? void 0 : _b.reference;
         const logins = this.getLogins().map((login) => {
@@ -706,15 +354,23 @@ class OvokClient extends core_1.MedplumClient {
         if (activeAccountId) {
             expiredAccountIds.add(activeAccountId);
         }
-        const queueKey = (_c = this.offlineQueueOptions.storageKey) !== null && _c !== void 0 ? _c : offline_1.OFFLINE_MEASUREMENT_QUEUE_STORAGE_KEY;
+        this.clearKeepingQueue(() => {
+            if (logins.length > 0) {
+                storage === null || storage === void 0 ? void 0 : storage.setObject(account_storage_1.LOGINS_STORAGE_KEY, logins);
+            }
+            if (expiredAccountIds.size > 0) {
+                storage === null || storage === void 0 ? void 0 : storage.setObject(account_storage_1.EXPIRED_ACCOUNTS_STORAGE_KEY, Array.from(expiredAccountIds));
+            }
+        });
+    }
+    /** Runs Medplum's storage clear but keeps queued offline measurements; `restore` runs in between. */
+    clearKeepingQueue(restore) {
+        var _a;
+        const storage = this.clientStorage;
+        const queueKey = (_a = this.offlineQueueOptions.storageKey) !== null && _a !== void 0 ? _a : offline_1.OFFLINE_MEASUREMENT_QUEUE_STORAGE_KEY;
         const queuedMeasurements = storage === null || storage === void 0 ? void 0 : storage.getObject(queueKey);
         super.clear();
-        if (logins.length > 0) {
-            storage === null || storage === void 0 ? void 0 : storage.setObject(account_storage_1.LOGINS_STORAGE_KEY, logins);
-        }
-        if (expiredAccountIds.size > 0) {
-            storage === null || storage === void 0 ? void 0 : storage.setObject(account_storage_1.EXPIRED_ACCOUNTS_STORAGE_KEY, Array.from(expiredAccountIds));
-        }
+        restore === null || restore === void 0 ? void 0 : restore();
         if (Array.isArray(queuedMeasurements)) {
             storage === null || storage === void 0 ? void 0 : storage.setObject(queueKey, queuedMeasurements);
         }
@@ -728,7 +384,7 @@ class OvokClient extends core_1.MedplumClient {
     }
     createAccountSessionClient(login) {
         const storage = new core_1.ClientStorage(new core_1.MemoryStorage(), this.clientOptions.storagePrefix);
-        storage.setObject("activeLogin", login);
+        storage.setObject(account_storage_1.ACTIVE_LOGIN_STORAGE_KEY, login);
         storage.setObject(account_storage_1.LOGINS_STORAGE_KEY, [login]);
         const client = new OvokClient({
             ...this.clientOptions,
@@ -761,7 +417,7 @@ class OvokClient extends core_1.MedplumClient {
             ...login,
             profile: { ...login.profile, display: (0, core_1.getDisplayString)(profile) },
         };
-        (_b = this.clientStorage) === null || _b === void 0 ? void 0 : _b.setObject("activeLogin", updatedLogin);
+        (_b = this.clientStorage) === null || _b === void 0 ? void 0 : _b.setObject(account_storage_1.ACTIVE_LOGIN_STORAGE_KEY, updatedLogin);
         (_c = this.clientStorage) === null || _c === void 0 ? void 0 : _c.setObject(account_storage_1.LOGINS_STORAGE_KEY, this.getLogins().map((savedLogin) => { var _a; return ((_a = savedLogin.profile) === null || _a === void 0 ? void 0 : _a.reference) === accountId ? updatedLogin : savedLogin; }));
     }
     async restoreActiveLogin(login) {
@@ -778,10 +434,10 @@ class OvokClient extends core_1.MedplumClient {
             resourceType: "Bundle",
             type: "transaction",
             entry: entries,
-        }, ...(requestOptions === undefined ? [] : [requestOptions]));
+        }, ...(0, request_options_1.optionalArg)(requestOptions));
     }
     async executeObservationBundle(bundle, requestOptions) {
-        const response = await (0, observation_bundle_utils_1.executeObservationBundle)(bundle, (request) => this.executeBatch(request, ...(requestOptions === undefined ? [] : [requestOptions])));
+        const response = await (0, observation_bundle_utils_1.executeObservationBundle)(bundle, (request) => this.executeBatch(request, ...(0, request_options_1.optionalArg)(requestOptions)));
         this.invalidateSearches("Observation");
         return response;
     }