@ovok/core 0.4.36 → 0.4.38

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

@@ -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";
@@ -22,8 +23,8 @@ 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";
     response: Bundle;
@@ -32,19 +33,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;
@@ -95,12 +83,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;