@ovok/core 0.4.37 → 0.4.39

package/dist/client/offline/offline-measurement-queue.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stableMeasurementId = exports.entryForObservation = exports.OFFLINE_MEASUREMENT_IDENTIFIER_SYSTEM = exports.DEFAULT_OFFLINE_MEASUREMENT_QUEUE_KEY = exports.OfflineMeasurementQueue = exports.OFFLINE_MEASUREMENT_QUEUE_STORAGE_KEY = void 0;
+const fhir_systems_1 = require("../observation/fhir-systems");
+const request_options_1 = require("../request-options");
 exports.OFFLINE_MEASUREMENT_QUEUE_STORAGE_KEY = "ovok.core.offline-measurements";
 exports.DEFAULT_OFFLINE_MEASUREMENT_QUEUE_KEY = exports.OFFLINE_MEASUREMENT_QUEUE_STORAGE_KEY;
 const DEFAULT_MAX_RETRIES = 8;
@@ -8,7 +10,6 @@ const DEFAULT_RETRY_BACKOFF_MS = 5000;
 const DEFAULT_MAX_RETRY_BACKOFF_MS = 60 * 60 * 1000;
 const IDENTIFIER_SYSTEM = "https://api.ovok.com/fhir/StructureDefinition/offline-measurement-id";
 exports.OFFLINE_MEASUREMENT_IDENTIFIER_SYSTEM = IDENTIFIER_SYSTEM;
-const DEVICE_READING_IDENTIFIER_SYSTEM = "https://api.ovok.com/fhir/StructureDefinition/device-reading-id";
 const canonicalize = (value) => {
     if (value instanceof Date) {
         return value.toISOString();
@@ -47,10 +48,10 @@ const stableValueId = (input) => {
 };
 const stableMeasurementId = (observation) => {
     const identifiers = observation.identifier;
-    if (!(identifiers === null || identifiers === void 0 ? void 0 : identifiers.some((identifier) => identifier.system === DEVICE_READING_IDENTIFIER_SYSTEM))) {
+    if (!(identifiers === null || identifiers === void 0 ? void 0 : identifiers.some((identifier) => identifier.system === fhir_systems_1.DEVICE_READING_IDENTIFIER_SYSTEM))) {
         return stableValueId(observation);
     }
-    const remainingIdentifiers = identifiers.filter((identifier) => identifier.system !== DEVICE_READING_IDENTIFIER_SYSTEM);
+    const remainingIdentifiers = identifiers.filter((identifier) => identifier.system !== fhir_systems_1.DEVICE_READING_IDENTIFIER_SYSTEM);
     const legacyObservation = { ...observation };
     if (remainingIdentifiers.length > 0) {
         legacyObservation.identifier = remainingIdentifiers;
@@ -68,9 +69,9 @@ const entryForObservation = (observation) => {
         system: IDENTIFIER_SYSTEM,
         value: id,
     };
-    const sourceIdentifier = (_a = observation.identifier) === null || _a === void 0 ? void 0 : _a.find((item) => item.system === DEVICE_READING_IDENTIFIER_SYSTEM);
+    const sourceIdentifier = (_a = observation.identifier) === null || _a === void 0 ? void 0 : _a.find((item) => item.system === fhir_systems_1.DEVICE_READING_IDENTIFIER_SYSTEM);
     const ifNoneExist = sourceIdentifier
-        ? `identifier=${encodeURIComponent(`${IDENTIFIER_SYSTEM}|${id}`)},${encodeURIComponent(`${DEVICE_READING_IDENTIFIER_SYSTEM}|${sourceIdentifier.value}`)}`
+        ? `identifier=${encodeURIComponent(`${IDENTIFIER_SYSTEM}|${id}`)},${encodeURIComponent(`${fhir_systems_1.DEVICE_READING_IDENTIFIER_SYSTEM}|${sourceIdentifier.value}`)}`
         : `identifier=${IDENTIFIER_SYSTEM}|${id}`;
     return {
         fullUrl: `urn:uuid:${id}`,
@@ -94,6 +95,24 @@ const isFailedResponse = (bundle) => {
         return status.startsWith("4") || status.startsWith("5");
     })) !== null && _b !== void 0 ? _b : false;
 };
+/** The stored failure: name, and code/status when present; never the message or payload. */
+const summarizeFailure = (error) => {
+    const failure = error;
+    return {
+        name: typeof (failure === null || failure === void 0 ? void 0 : failure.name) === "string" ? failure.name : "Error",
+        ...(typeof (failure === null || failure === void 0 ? void 0 : failure.code) === "string" ? { code: failure.code } : {}),
+        ...(typeof (failure === null || failure === void 0 ? void 0 : failure.status) === "number" ? { status: failure.status } : {}),
+    };
+};
+/** Counts an item that stays in the queue. */
+const tally = (result, item) => {
+    if (item.exhausted) {
+        result.exhausted++;
+    }
+    else {
+        result.queued++;
+    }
+};
 class OfflineMeasurementQueue {
     constructor(storage, transport, options = {}) {
         var _a, _b, _c, _d;
@@ -123,13 +142,13 @@ class OfflineMeasurementQueue {
                     });
                     this.writeQueue(queue);
                 }
-                return { id, flush: await this.flushQueue(queue, {}, ...(requestOptions === undefined ? [] : [requestOptions])) };
+                return { id, flush: await this.flushQueue(queue, {}, ...(0, request_options_1.optionalArg)(requestOptions)) };
             });
         };
         this.flush = (options = {}, requestOptions) => this.runExclusive(async () => {
             var _a, _b;
             await ((_b = (_a = this.storage).getInitPromise) === null || _b === void 0 ? void 0 : _b.call(_a));
-            return this.flushQueue(this.readQueue(), options, ...(requestOptions === undefined ? [] : [requestOptions]));
+            return this.flushQueue(this.readQueue(), options, ...(0, request_options_1.optionalArg)(requestOptions));
         });
         this.runExclusive = (operation) => {
             const next = this.operation.then(operation, operation);
@@ -180,12 +199,7 @@ class OfflineMeasurementQueue {
                 }
                 if ((item.exhausted && !options.includeExhausted) ||
                     item.nextAttemptAt > now) {
-                    if (item.exhausted) {
-                        result.exhausted++;
-                    }
-                    else {
-                        result.queued++;
-                    }
+                    tally(result, item);
                     continue;
                 }
                 const ownerKey = (_a = this.getOwnerKey) === null || _a === void 0 ? void 0 : _a.call(this);
@@ -200,7 +214,7 @@ class OfflineMeasurementQueue {
                         resourceType: "Bundle",
                         type: "transaction",
                         entry: item.entries,
-                    }, ...(requestOptions === undefined ? [] : [requestOptions]));
+                    }, ...(0, request_options_1.optionalArg)(requestOptions));
                     if (isFailedResponse(response)) {
                         throw response;
                     }
@@ -217,20 +231,9 @@ class OfflineMeasurementQueue {
                         : Date.now() +
                             Math.min(this.maxRetryBackoffMs, this.retryBackoffMs * 2 ** (attempt - 1));
                     changed = true;
-                    const failure = error;
-                    const lastFailure = {
-                        name: typeof (failure === null || failure === void 0 ? void 0 : failure.name) === "string" ? failure.name : "Error",
-                        ...(typeof (failure === null || failure === void 0 ? void 0 : failure.code) === "string" ? { code: failure.code } : {}),
-                        ...(typeof (failure === null || failure === void 0 ? void 0 : failure.status) === "number" ? { status: failure.status } : {}),
-                    };
-                    item.lastFailure = lastFailure;
-                    result.failures[item.id] = lastFailure;
-                    if (item.exhausted) {
-                        result.exhausted++;
-                    }
-                    else {
-                        result.queued++;
-                    }
+                    item.lastFailure = summarizeFailure(error);
+                    result.failures[item.id] = item.lastFailure;
+                    tally(result, item);
                 }
             }
             if (changed) {

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

@@ -23,8 +23,7 @@ import * as platformMethods from "./platform/methods";
 import * as questionnaireResponseMethods from "./questionnaire-response/methods";
 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 { MAX_CONDITIONAL_OBSERVATION_ENTRIES, MAX_OBSERVATION_BUNDLE_BYTES, } from "./observation/observation-bundle-utils";
 export type { OvokUnauthenticatedReason } from "./auth/session-fetch";
 export type SaveObservationsResult = {
     status: "saved";
@@ -51,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.
@@ -58,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[];
@@ -84,12 +91,16 @@ export declare class OvokClient extends MedplumClient {
     /** Flushes measurements queued while offline. Call this on connectivity/app-resume events. */
     flushOfflineMeasurementQueue(options?: OfflineMeasurementFlushOptions, requestOptions?: MedplumRequestOptions): Promise<OfflineMeasurementFlushResult>;
     private getOfflineMeasurementQueue;
+    /** Queued measurements belong to one account on one server and project. */
+    private offlineOwnerKey;
     /**
      * 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(): void;
+    /** Runs Medplum's storage clear but keeps queued offline measurements; `restore` runs in between. */
+    private clearKeepingQueue;
     private getLogin;
     private getExpiredAccountIds;
     private createAccountSessionClient;

package/dist/client/ovok-client.js

@@ -61,13 +61,17 @@ 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 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.
@@ -91,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;
@@ -130,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;
@@ -146,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("activeLogin", activeLogin);
-                this.setAccessToken(accessToken, activeLogin.refreshToken);
-                return;
+                return; // the still-valid access token carries the request
             }
             throw error;
         }
@@ -156,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)) {
@@ -225,7 +272,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)) {
@@ -253,14 +300,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) {
@@ -274,22 +314,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 }
@@ -311,7 +351,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;
@@ -321,31 +361,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) => {
@@ -358,15 +400,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);
         }
@@ -380,7 +430,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,
@@ -413,7 +463,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) {
@@ -430,10 +480,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;
     }

package/dist/client/patient/methods.js

@@ -22,70 +22,70 @@ exports.listPatientNotifications = listPatientNotifications;
 exports.getPatientNotification = getPatientNotification;
 exports.getPatientDashboard = getPatientDashboard;
 const query_string_1 = require("../query-string");
+const request_options_1 = require("../request-options");
 async function getCurrentPatientProfile(requestOptions) {
-    return this.get("/auth/me", ...(requestOptions === undefined ? [] : [requestOptions]));
+    return this.get("/auth/me", ...(0, request_options_1.optionalArg)(requestOptions));
 }
 async function getPatientLatestObservations(params = {}, requestOptions) {
-    const code = Array.isArray(params.code) ? params.code.join(",") : params.code;
     return this.get(`/fhir/Observation/$lastn${(0, query_string_1.toQueryString)({
         patient: params.patient,
         max: params.max,
-        code,
-    })}`, { ...{ cache: "no-cache" }, ...requestOptions });
+        code: params.code,
+    })}`, { cache: "no-cache", ...requestOptions });
 }
 async function listPatientAppointments(params = {}, requestOptions) {
-    return this.searchResources("Appointment", params, ...(requestOptions === undefined ? [] : [requestOptions]));
+    return this.searchResources("Appointment", params, ...(0, request_options_1.optionalArg)(requestOptions));
 }
 async function getPatientAppointment(appointmentId, requestOptions) {
-    return this.readResource("Appointment", appointmentId, ...(requestOptions === undefined ? [] : [requestOptions]));
+    return this.readResource("Appointment", appointmentId, ...(0, request_options_1.optionalArg)(requestOptions));
 }
 async function createPatientAppointment(appointment, requestOptions) {
-    return this.createResource(appointment, ...(requestOptions === undefined ? [] : [requestOptions]));
+    return this.createResource(appointment, ...(0, request_options_1.optionalArg)(requestOptions));
 }
 async function updatePatientAppointment(appointment, requestOptions) {
-    return this.updateResource(appointment, ...(requestOptions === undefined ? [] : [requestOptions]));
+    return this.updateResource(appointment, ...(0, request_options_1.optionalArg)(requestOptions));
 }
 async function listPatientSchedules(params = {}, requestOptions) {
-    return this.searchResources("Schedule", params, ...(requestOptions === undefined ? [] : [requestOptions]));
+    return this.searchResources("Schedule", params, ...(0, request_options_1.optionalArg)(requestOptions));
 }
 async function listPatientSlots(params = {}, requestOptions) {
-    return this.searchResources("Slot", params, ...(requestOptions === undefined ? [] : [requestOptions]));
+    return this.searchResources("Slot", params, ...(0, request_options_1.optionalArg)(requestOptions));
 }
 async function listPatientMeasurementHistory(params = {}, requestOptions) {
-    return (await this.searchResources("Observation", params, ...(requestOptions === undefined ? [] : [requestOptions])));
+    return (await this.searchResources("Observation", params, ...(0, request_options_1.optionalArg)(requestOptions)));
 }
 async function getPatientMeasurement(measurementId, requestOptions) {
-    return this.readResource("Observation", measurementId, ...(requestOptions === undefined ? [] : [requestOptions]));
+    return this.readResource("Observation", measurementId, ...(0, request_options_1.optionalArg)(requestOptions));
 }
 async function listPatientCarePlans(params = {}, requestOptions) {
-    return (await this.searchResources("CarePlan", params, ...(requestOptions === undefined ? [] : [requestOptions])));
+    return (await this.searchResources("CarePlan", params, ...(0, request_options_1.optionalArg)(requestOptions)));
 }
 async function getPatientCarePlan(carePlanId, requestOptions) {
-    return this.readResource("CarePlan", carePlanId, ...(requestOptions === undefined ? [] : [requestOptions]));
+    return this.readResource("CarePlan", carePlanId, ...(0, request_options_1.optionalArg)(requestOptions));
 }
 async function listPatientQuestionnaires(params = {}, requestOptions) {
-    return (await this.searchResources("Questionnaire", params, ...(requestOptions === undefined ? [] : [requestOptions])));
+    return (await this.searchResources("Questionnaire", params, ...(0, request_options_1.optionalArg)(requestOptions)));
 }
 async function getPatientQuestionnaire(questionnaireId, requestOptions) {
-    return this.readResource("Questionnaire", questionnaireId, ...(requestOptions === undefined ? [] : [requestOptions]));
+    return this.readResource("Questionnaire", questionnaireId, ...(0, request_options_1.optionalArg)(requestOptions));
 }
 async function listPatientQuestionnaireResponses(params = {}, requestOptions) {
-    return (await this.searchResources("QuestionnaireResponse", params, ...(requestOptions === undefined ? [] : [requestOptions])));
+    return (await this.searchResources("QuestionnaireResponse", params, ...(0, request_options_1.optionalArg)(requestOptions)));
 }
 async function getPatientQuestionnaireResponse(questionnaireResponseId, requestOptions) {
-    return this.readResource("QuestionnaireResponse", questionnaireResponseId, ...(requestOptions === undefined ? [] : [requestOptions]));
+    return this.readResource("QuestionnaireResponse", questionnaireResponseId, ...(0, request_options_1.optionalArg)(requestOptions));
 }
 async function listPatientDevices(params = {}, requestOptions) {
-    return (await this.searchResources("Device", params, ...(requestOptions === undefined ? [] : [requestOptions])));
+    return (await this.searchResources("Device", params, ...(0, request_options_1.optionalArg)(requestOptions)));
 }
 async function getPatientDevice(deviceId, requestOptions) {
-    return this.readResource("Device", deviceId, ...(requestOptions === undefined ? [] : [requestOptions]));
+    return this.readResource("Device", deviceId, ...(0, request_options_1.optionalArg)(requestOptions));
 }
 async function listPatientNotifications(params = {}, requestOptions) {
-    return (await this.searchResources("CommunicationRequest", params, ...(requestOptions === undefined ? [] : [requestOptions])));
+    return (await this.searchResources("CommunicationRequest", params, ...(0, request_options_1.optionalArg)(requestOptions)));
 }
 async function getPatientNotification(notificationId, requestOptions) {
-    return this.readResource("CommunicationRequest", notificationId, ...(requestOptions === undefined ? [] : [requestOptions]));
+    return this.readResource("CommunicationRequest", notificationId, ...(0, request_options_1.optionalArg)(requestOptions));
 }
 async function getPatientDashboard(params = {}, requestOptions) {
     var _a, _b, _c, _d, _e, _f;
@@ -94,16 +94,16 @@ async function getPatientDashboard(params = {}, requestOptions) {
     const latestObservations = await this.getPatientLatestObservations({
         ...params.latestObservations,
         patient: (_b = (_a = params.latestObservations) === null || _a === void 0 ? void 0 : _a.patient) !== null && _b !== void 0 ? _b : patient,
-    }, ...(requestOptions === undefined ? [] : [requestOptions]));
+    }, ...(0, request_options_1.optionalArg)(requestOptions));
     const [measurementHistory, carePlans] = await Promise.all([
         this.listPatientMeasurementHistory({
             ...params.measurementHistory,
             patient: (_d = (_c = params.measurementHistory) === null || _c === void 0 ? void 0 : _c.patient) !== null && _d !== void 0 ? _d : patient,
-        }, ...(requestOptions === undefined ? [] : [requestOptions])),
+        }, ...(0, request_options_1.optionalArg)(requestOptions)),
         this.listPatientCarePlans({
             ...params.carePlans,
             patient: (_f = (_e = params.carePlans) === null || _e === void 0 ? void 0 : _e.patient) !== null && _f !== void 0 ? _f : patient,
-        }, ...(requestOptions === undefined ? [] : [requestOptions])),
+        }, ...(0, request_options_1.optionalArg)(requestOptions)),
     ]);
     return { carePlans, latestObservations, measurementHistory, profile };
 }

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

@@ -6,6 +6,7 @@ exports.listPatientSharing = listPatientSharing;
 exports.revokePatientSharing = revokePatientSharing;
 exports.getPatientSharingSettings = getPatientSharingSettings;
 exports.updatePatientSharingSettings = updatePatientSharingSettings;
+const request_options_1 = require("../request-options");
 function createPatientSharingInvite(body, requestOptions) {
     return this.post("/v1/patient-sharing/invites", body, undefined, requestOptions);
 }
@@ -16,7 +17,7 @@ function redeemPatientSharingInvite(body, requestOptions) {
     });
 }
 function listPatientSharing(requestOptions) {
-    return this.get("/v1/patient-sharing/shares", ...(requestOptions === undefined ? [] : [requestOptions])).then((shares) => {
+    return this.get("/v1/patient-sharing/shares", ...(0, request_options_1.optionalArg)(requestOptions)).then((shares) => {
         var _a;
         return ({
             ...shares,
@@ -25,11 +26,11 @@ function listPatientSharing(requestOptions) {
     });
 }
 async function revokePatientSharing(consentId, requestOptions) {
-    await this.delete(`/v1/patient-sharing/shares/${encodeURIComponent(consentId)}`, ...(requestOptions === undefined ? [] : [requestOptions]));
+    await this.delete(`/v1/patient-sharing/shares/${encodeURIComponent(consentId)}`, ...(0, request_options_1.optionalArg)(requestOptions));
     this.invalidateUrl("/v1/patient-sharing/shares");
 }
 function getPatientSharingSettings(requestOptions) {
-    return this.get("/v1/patient-sharing/settings", ...(requestOptions === undefined ? [] : [requestOptions]));
+    return this.get("/v1/patient-sharing/settings", ...(0, request_options_1.optionalArg)(requestOptions));
 }
 function updatePatientSharingSettings(settings, requestOptions) {
     return this.put("/v1/patient-sharing/settings", settings, undefined, requestOptions);