@ovok/core 0.4.21 → 0.4.22

package/dist/client/offline/offline-measurement-queue.d.ts

@@ -1,6 +1,6 @@
 import { IClientStorage } from "@medplum/core";
 import { Bundle, BundleEntry, Observation } from "@medplum/fhirtypes";
-declare const DEFAULT_STORAGE_KEY = "ovok.core.offline-measurements";
+export declare const OFFLINE_MEASUREMENT_QUEUE_STORAGE_KEY = "ovok.core.offline-measurements";
 declare const IDENTIFIER_SYSTEM = "https://api.ovok.com/fhir/StructureDefinition/offline-measurement-id";
 export type OfflineMeasurementQueueOptions = {
     enabled?: boolean;
@@ -8,6 +8,8 @@ export type OfflineMeasurementQueueOptions = {
     maxRetries?: number;
     retryBackoffMs?: number;
     maxRetryBackoffMs?: number;
+    /** Returns the active account key. Queue items are delivered only to their owner. */
+    getOwnerKey?: () => string | undefined;
 };
 export type OfflineMeasurementFlushOptions = {
     includeExhausted?: boolean;
@@ -30,6 +32,7 @@ export declare class OfflineMeasurementQueue {
     private readonly maxRetries;
     private readonly retryBackoffMs;
     private readonly maxRetryBackoffMs;
+    private readonly getOwnerKey?;
     private operation;
     constructor(storage: IClientStorage, transport: MeasurementTransport, options?: OfflineMeasurementQueueOptions);
     enqueueAndFlush: (observations: Observation[]) => Promise<{
@@ -42,4 +45,4 @@ export declare class OfflineMeasurementQueue {
     private writeQueue;
     private flushQueue;
 }
-export { DEFAULT_STORAGE_KEY as DEFAULT_OFFLINE_MEASUREMENT_QUEUE_KEY, IDENTIFIER_SYSTEM as OFFLINE_MEASUREMENT_IDENTIFIER_SYSTEM, entryForObservation, stableMeasurementId, };
+export { OFFLINE_MEASUREMENT_QUEUE_STORAGE_KEY as DEFAULT_OFFLINE_MEASUREMENT_QUEUE_KEY, IDENTIFIER_SYSTEM as OFFLINE_MEASUREMENT_IDENTIFIER_SYSTEM, entryForObservation, stableMeasurementId, };

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

@@ -1,8 +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 = void 0;
-const DEFAULT_STORAGE_KEY = "ovok.core.offline-measurements";
-exports.DEFAULT_OFFLINE_MEASUREMENT_QUEUE_KEY = DEFAULT_STORAGE_KEY;
+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;
+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;
 const DEFAULT_RETRY_BACKOFF_MS = 5000;
 const DEFAULT_MAX_RETRY_BACKOFF_MS = 60 * 60 * 1000;
@@ -82,14 +82,19 @@ class OfflineMeasurementQueue {
         this.transport = transport;
         this.operation = Promise.resolve();
         this.enqueueAndFlush = (observations) => this.runExclusive(async () => {
-            var _a, _b;
+            var _a, _b, _c;
             await ((_b = (_a = this.storage).getInitPromise) === null || _b === void 0 ? void 0 : _b.call(_a));
             const queue = this.readQueue();
             const entries = observations.map(entryForObservation);
-            const id = stableValueId(entries);
+            const ownerKey = (_c = this.getOwnerKey) === null || _c === void 0 ? void 0 : _c.call(this);
+            if (this.getOwnerKey && !ownerKey) {
+                throw new Error("Offline measurements require an active account to prevent cross-account delivery.");
+            }
+            const id = stableValueId({ ownerKey, entries });
             if (!queue.some((item) => item.id === id)) {
                 queue.push({
                     id,
+                    ownerKey,
                     queuedAt: new Date().toISOString(),
                     attempt: 0,
                     nextAttemptAt: 0,
@@ -130,6 +135,7 @@ class OfflineMeasurementQueue {
             }
         };
         this.flushQueue = async (queue, options = {}) => {
+            var _a;
             const result = {
                 attempted: 0,
                 saved: 0,
@@ -138,6 +144,7 @@ class OfflineMeasurementQueue {
                 responses: {},
             };
             const now = Date.now();
+            const ownerKey = (_a = this.getOwnerKey) === null || _a === void 0 ? void 0 : _a.call(this);
             let changed = false;
             for (const item of [...queue]) {
                 if (item.exhausted && options.resetExhausted) {
@@ -156,6 +163,10 @@ class OfflineMeasurementQueue {
                     }
                     continue;
                 }
+                if (this.getOwnerKey && (!ownerKey || item.ownerKey !== ownerKey)) {
+                    result.queued++;
+                    continue;
+                }
                 result.attempted++;
                 const attempt = item.attempt + 1;
                 try {
@@ -172,7 +183,7 @@ class OfflineMeasurementQueue {
                     result.responses[item.id] = response;
                     changed = true;
                 }
-                catch (_a) {
+                catch (_b) {
                     item.attempt = attempt;
                     item.exhausted = attempt >= this.maxRetries;
                     item.nextAttemptAt = item.exhausted
@@ -193,10 +204,12 @@ class OfflineMeasurementQueue {
             }
             return result;
         };
-        this.storageKey = (_a = options.storageKey) !== null && _a !== void 0 ? _a : DEFAULT_STORAGE_KEY;
+        this.storageKey =
+            (_a = options.storageKey) !== null && _a !== void 0 ? _a : exports.OFFLINE_MEASUREMENT_QUEUE_STORAGE_KEY;
         this.maxRetries = Math.max(1, (_b = options.maxRetries) !== null && _b !== void 0 ? _b : DEFAULT_MAX_RETRIES);
         this.retryBackoffMs = Math.max(1, (_c = options.retryBackoffMs) !== null && _c !== void 0 ? _c : DEFAULT_RETRY_BACKOFF_MS);
         this.maxRetryBackoffMs = Math.max(this.retryBackoffMs, (_d = options.maxRetryBackoffMs) !== null && _d !== void 0 ? _d : DEFAULT_MAX_RETRY_BACKOFF_MS);
+        this.getOwnerKey = options.getOwnerKey;
     }
 }
 exports.OfflineMeasurementQueue = OfflineMeasurementQueue;

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

@@ -55,6 +55,11 @@ export declare class OvokClient extends MedplumClient {
     /** Flushes measurements queued while offline. Call this on connectivity/app-resume events. */
     flushOfflineMeasurementQueue(options?: OfflineMeasurementFlushOptions): Promise<OfflineMeasurementFlushResult>;
     private getOfflineMeasurementQueue;
+    /**
+     * Medplum clears its entire client storage after an unrecoverable 401. Keep
+     * queued measurements so they can be retried only after their owner signs in.
+     */
+    clear(): void;
     private executeConditionalObservationCreates;
     private executeObservationBundle;
     private bindMethods;

package/dist/client/ovok-client.js

@@ -148,9 +148,38 @@ class OvokClient extends core_1.MedplumClient {
         if (!this.clientStorage) {
             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) => this.executeObservationBundle(bundle), this.offlineQueueOptions));
+        (_a = this.offlineMeasurementQueue) !== null && _a !== void 0 ? _a : (this.offlineMeasurementQueue = new offline_1.OfflineMeasurementQueue(this.clientStorage, (bundle) => this.executeObservationBundle(bundle), {
+            ...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("|");
+            },
+        }));
         return this.offlineMeasurementQueue;
     }
+    /**
+     * Medplum clears its entire client storage after an unrecoverable 401. Keep
+     * queued measurements so they can be retried only after their owner signs in.
+     */
+    clear() {
+        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);
+        }
+    }
     async executeConditionalObservationCreates(observations) {
         const entries = observations.map(offline_1.entryForObservation);
         return this.executeObservationBundle({

package/dist/conformance/capability-requirements.js

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

package/package.json

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