@medplum/core 0.9.13 → 0.9.16

package/dist/cjs/index.js

@@ -820,155 +820,6 @@
         return decodePayload(payload);
     }
 
-    const OK_ID = 'ok';
-    const CREATED_ID = 'created';
-    const GONE_ID = 'gone';
-    const NOT_MODIFIED_ID = 'not-modified';
-    const NOT_FOUND_ID = 'not-found';
-    const ACCESS_DENIED = 'access-denied';
-    const allOk = {
-        resourceType: 'OperationOutcome',
-        id: OK_ID,
-        issue: [
-            {
-                severity: 'information',
-                code: 'information',
-                details: {
-                    text: 'All OK',
-                },
-            },
-        ],
-    };
-    const created = {
-        resourceType: 'OperationOutcome',
-        id: CREATED_ID,
-        issue: [
-            {
-                severity: 'information',
-                code: 'information',
-                details: {
-                    text: 'Created',
-                },
-            },
-        ],
-    };
-    const notModified = {
-        resourceType: 'OperationOutcome',
-        id: NOT_MODIFIED_ID,
-        issue: [
-            {
-                severity: 'information',
-                code: 'information',
-                details: {
-                    text: 'Not Modified',
-                },
-            },
-        ],
-    };
-    const notFound = {
-        resourceType: 'OperationOutcome',
-        id: NOT_FOUND_ID,
-        issue: [
-            {
-                severity: 'error',
-                code: 'not-found',
-                details: {
-                    text: 'Not found',
-                },
-            },
-        ],
-    };
-    const gone = {
-        resourceType: 'OperationOutcome',
-        id: GONE_ID,
-        issue: [
-            {
-                severity: 'error',
-                code: 'gone',
-                details: {
-                    text: 'Gone',
-                },
-            },
-        ],
-    };
-    const accessDenied = {
-        resourceType: 'OperationOutcome',
-        id: ACCESS_DENIED,
-        issue: [
-            {
-                severity: 'error',
-                code: 'access-denied',
-                details: {
-                    text: 'Access Denied',
-                },
-            },
-        ],
-    };
-    function badRequest(details, expression) {
-        return {
-            resourceType: 'OperationOutcome',
-            issue: [
-                {
-                    severity: 'error',
-                    code: 'invalid',
-                    details: {
-                        text: details,
-                    },
-                    expression: expression ? [expression] : undefined,
-                },
-            ],
-        };
-    }
-    function isOk(outcome) {
-        return outcome.id === OK_ID || outcome.id === CREATED_ID || outcome.id === NOT_MODIFIED_ID;
-    }
-    function isNotFound(outcome) {
-        return outcome.id === NOT_FOUND_ID;
-    }
-    function isGone(outcome) {
-        return outcome.id === GONE_ID;
-    }
-    function getStatus(outcome) {
-        if (outcome.id === OK_ID) {
-            return 200;
-        }
-        else if (outcome.id === CREATED_ID) {
-            return 201;
-        }
-        else if (outcome.id === NOT_MODIFIED_ID) {
-            return 304;
-        }
-        else if (outcome.id === ACCESS_DENIED) {
-            return 403;
-        }
-        else if (outcome.id === NOT_FOUND_ID) {
-            return 404;
-        }
-        else if (outcome.id === GONE_ID) {
-            return 410;
-        }
-        else {
-            return 400;
-        }
-    }
-    /**
-     * Asserts that the operation completed successfully and that the resource is defined.
-     * @param outcome The operation outcome.
-     * @param resource The resource that may or may not have been returned.
-     */
-    function assertOk(outcome, resource) {
-        if (!isOk(outcome) || resource === undefined) {
-            throw new OperationOutcomeError(outcome);
-        }
-    }
-    class OperationOutcomeError extends Error {
-        constructor(outcome) {
-            var _a, _b;
-            super((_b = (_a = outcome === null || outcome === void 0 ? void 0 : outcome.issue) === null || _a === void 0 ? void 0 : _a[0].details) === null || _b === void 0 ? void 0 : _b.text);
-            this.outcome = outcome;
-        }
-    }
-
     var _ReadablePromise_suspender, _ReadablePromise_status, _ReadablePromise_response, _ReadablePromise_error, _a;
     /**
      * The ReadablePromise class wraps a request promise suitable for React Suspense.
@@ -1333,10 +1184,11 @@
 
     // PKCE auth ased on:
     // https://aws.amazon.com/blogs/security/how-to-add-authentication-single-page-web-application-with-amazon-cognito-oauth2-implementation/
-    var _MedplumClient_instances, _MedplumClient_fetch, _MedplumClient_createPdf, _MedplumClient_storage, _MedplumClient_schema, _MedplumClient_requestCache, _MedplumClient_baseUrl, _MedplumClient_clientId, _MedplumClient_authorizeUrl, _MedplumClient_tokenUrl, _MedplumClient_logoutUrl, _MedplumClient_onUnauthenticated, _MedplumClient_accessToken, _MedplumClient_refreshToken, _MedplumClient_refreshPromise, _MedplumClient_profilePromise, _MedplumClient_profile, _MedplumClient_config, _MedplumClient_addLogin, _MedplumClient_refreshProfile, _MedplumClient_request, _MedplumClient_addFetchOptionsDefaults, _MedplumClient_setRequestContentType, _MedplumClient_setRequestBody, _MedplumClient_handleUnauthenticated, _MedplumClient_startPkce, _MedplumClient_requestAuthorization, _MedplumClient_refresh, _MedplumClient_fetchTokens, _MedplumClient_verifyTokens, _MedplumClient_setupStorageListener;
+    var _MedplumClient_instances, _MedplumClient_fetch, _MedplumClient_createPdf, _MedplumClient_storage, _MedplumClient_schema, _MedplumClient_requestCache, _MedplumClient_cacheTime, _MedplumClient_baseUrl, _MedplumClient_clientId, _MedplumClient_authorizeUrl, _MedplumClient_tokenUrl, _MedplumClient_logoutUrl, _MedplumClient_onUnauthenticated, _MedplumClient_accessToken, _MedplumClient_refreshToken, _MedplumClient_refreshPromise, _MedplumClient_profilePromise, _MedplumClient_profile, _MedplumClient_config, _MedplumClient_addLogin, _MedplumClient_refreshProfile, _MedplumClient_getCacheEntry, _MedplumClient_setCacheEntry, _MedplumClient_request, _MedplumClient_addFetchOptionsDefaults, _MedplumClient_setRequestContentType, _MedplumClient_setRequestBody, _MedplumClient_handleUnauthenticated, _MedplumClient_startPkce, _MedplumClient_requestAuthorization, _MedplumClient_refresh, _MedplumClient_fetchTokens, _MedplumClient_verifyTokens, _MedplumClient_setupStorageListener;
     const DEFAULT_BASE_URL = 'https://api.medplum.com/';
     const DEFAULT_SCOPE = 'launch/patient openid fhirUser offline_access user/*.*';
     const DEFAULT_RESOURCE_CACHE_SIZE = 1000;
+    const DEFAULT_CACHE_TIME = 10000; // 10 seconds
     const JSON_CONTENT_TYPE = 'application/json';
     const FHIR_CONTENT_TYPE = 'application/fhir+json';
     const PATCH_CONTENT_TYPE = 'application/json-patch+json';
@@ -1389,7 +1241,7 @@
      */
     class MedplumClient extends EventTarget {
         constructor(options) {
-            var _a;
+            var _a, _b;
             super();
             _MedplumClient_instances.add(this);
             _MedplumClient_fetch.set(this, void 0);
@@ -1397,6 +1249,7 @@
             _MedplumClient_storage.set(this, void 0);
             _MedplumClient_schema.set(this, void 0);
             _MedplumClient_requestCache.set(this, void 0);
+            _MedplumClient_cacheTime.set(this, void 0);
             _MedplumClient_baseUrl.set(this, void 0);
             _MedplumClient_clientId.set(this, void 0);
             _MedplumClient_authorizeUrl.set(this, void 0);
@@ -1422,6 +1275,7 @@
             __classPrivateFieldSet(this, _MedplumClient_storage, new ClientStorage(), "f");
             __classPrivateFieldSet(this, _MedplumClient_schema, createSchema(), "f");
             __classPrivateFieldSet(this, _MedplumClient_requestCache, new LRUCache((_a = options === null || options === void 0 ? void 0 : options.resourceCacheSize) !== null && _a !== void 0 ? _a : DEFAULT_RESOURCE_CACHE_SIZE), "f");
+            __classPrivateFieldSet(this, _MedplumClient_cacheTime, (_b = options === null || options === void 0 ? void 0 : options.cacheTime) !== null && _b !== void 0 ? _b : DEFAULT_CACHE_TIME, "f");
             __classPrivateFieldSet(this, _MedplumClient_baseUrl, (options === null || options === void 0 ? void 0 : options.baseUrl) || DEFAULT_BASE_URL, "f");
             __classPrivateFieldSet(this, _MedplumClient_clientId, (options === null || options === void 0 ? void 0 : options.clientId) || '', "f");
             __classPrivateFieldSet(this, _MedplumClient_authorizeUrl, (options === null || options === void 0 ? void 0 : options.authorizeUrl) || __classPrivateFieldGet(this, _MedplumClient_baseUrl, "f") + 'oauth2/authorize', "f");
@@ -1490,14 +1344,12 @@
          */
         get(url, options = {}) {
             url = url.toString();
-            if (!(options === null || options === void 0 ? void 0 : options.cache)) {
-                const cached = __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").get(url);
-                if (cached) {
-                    return cached;
-                }
+            const cached = __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_getCacheEntry).call(this, url, options);
+            if (cached) {
+                return cached.value;
             }
             const promise = new ReadablePromise(__classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_request).call(this, 'GET', url, options));
-            __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").set(url, promise);
+            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_setCacheEntry).call(this, url, promise);
             return promise;
         }
         /**
@@ -1737,14 +1589,12 @@
             url.searchParams.set('_count', '1');
             url.searchParams.sort();
             const cacheKey = url.toString() + '-searchOne';
-            if (!(options === null || options === void 0 ? void 0 : options.cache)) {
-                const cached = __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").get(cacheKey);
-                if (cached) {
-                    return cached;
-                }
+            const cached = __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_getCacheEntry).call(this, cacheKey, options);
+            if (cached) {
+                return cached.value;
             }
             const promise = new ReadablePromise(this.search(resourceType, url.searchParams, options).then((b) => { var _a, _b; return (_b = (_a = b.entry) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.resource; }));
-            __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").set(cacheKey, promise);
+            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_setCacheEntry).call(this, cacheKey, promise);
             return promise;
         }
         /**
@@ -1769,14 +1619,12 @@
         searchResources(resourceType, query, options = {}) {
             const url = this.fhirSearchUrl(resourceType, query);
             const cacheKey = url.toString() + '-searchResources';
-            if (!(options === null || options === void 0 ? void 0 : options.cache)) {
-                const cached = __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").get(cacheKey);
-                if (cached) {
-                    return cached;
-                }
+            const cached = __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_getCacheEntry).call(this, cacheKey, options);
+            if (cached) {
+                return cached.value;
             }
             const promise = new ReadablePromise(this.search(resourceType, query, options).then((b) => { var _a, _b; return (_b = (_a = b.entry) === null || _a === void 0 ? void 0 : _a.map((e) => e.resource)) !== null && _b !== void 0 ? _b : []; }));
-            __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").set(cacheKey, promise);
+            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_setCacheEntry).call(this, cacheKey, promise);
             return promise;
         }
         /**
@@ -1799,7 +1647,8 @@
          * @returns The resource if it is available in the cache; undefined otherwise.
          */
         getCached(resourceType, id) {
-            const cached = __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").get(this.fhirUrl(resourceType, id).toString());
+            var _a;
+            const cached = (_a = __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").get(this.fhirUrl(resourceType, id).toString())) === null || _a === void 0 ? void 0 : _a.value;
             return cached && !cached.isPending() ? cached.read() : undefined;
         }
         /**
@@ -2363,7 +2212,7 @@
             });
         }
     }
-    _MedplumClient_fetch = new WeakMap(), _MedplumClient_createPdf = new WeakMap(), _MedplumClient_storage = new WeakMap(), _MedplumClient_schema = new WeakMap(), _MedplumClient_requestCache = new WeakMap(), _MedplumClient_baseUrl = new WeakMap(), _MedplumClient_clientId = new WeakMap(), _MedplumClient_authorizeUrl = new WeakMap(), _MedplumClient_tokenUrl = new WeakMap(), _MedplumClient_logoutUrl = new WeakMap(), _MedplumClient_onUnauthenticated = new WeakMap(), _MedplumClient_accessToken = new WeakMap(), _MedplumClient_refreshToken = new WeakMap(), _MedplumClient_refreshPromise = new WeakMap(), _MedplumClient_profilePromise = new WeakMap(), _MedplumClient_profile = new WeakMap(), _MedplumClient_config = new WeakMap(), _MedplumClient_instances = new WeakSet(), _MedplumClient_addLogin = function _MedplumClient_addLogin(newLogin) {
+    _MedplumClient_fetch = new WeakMap(), _MedplumClient_createPdf = new WeakMap(), _MedplumClient_storage = new WeakMap(), _MedplumClient_schema = new WeakMap(), _MedplumClient_requestCache = new WeakMap(), _MedplumClient_cacheTime = new WeakMap(), _MedplumClient_baseUrl = new WeakMap(), _MedplumClient_clientId = new WeakMap(), _MedplumClient_authorizeUrl = new WeakMap(), _MedplumClient_tokenUrl = new WeakMap(), _MedplumClient_logoutUrl = new WeakMap(), _MedplumClient_onUnauthenticated = new WeakMap(), _MedplumClient_accessToken = new WeakMap(), _MedplumClient_refreshToken = new WeakMap(), _MedplumClient_refreshPromise = new WeakMap(), _MedplumClient_profilePromise = new WeakMap(), _MedplumClient_profile = new WeakMap(), _MedplumClient_config = new WeakMap(), _MedplumClient_instances = new WeakSet(), _MedplumClient_addLogin = function _MedplumClient_addLogin(newLogin) {
         const logins = this.getLogins().filter((login) => { var _a, _b; return ((_a = login.profile) === null || _a === void 0 ? void 0 : _a.reference) !== ((_b = newLogin.profile) === null || _b === void 0 ? void 0 : _b.reference); });
         logins.push(newLogin);
         __classPrivateFieldGet(this, _MedplumClient_storage, "f").setObject('logins', logins);
@@ -2382,6 +2231,19 @@
             }), "f");
             return __classPrivateFieldGet(this, _MedplumClient_profilePromise, "f");
         });
+    }, _MedplumClient_getCacheEntry = function _MedplumClient_getCacheEntry(key, options) {
+        if (__classPrivateFieldGet(this, _MedplumClient_cacheTime, "f") <= 0 || (options === null || options === void 0 ? void 0 : options.cache) === 'no-cache' || (options === null || options === void 0 ? void 0 : options.cache) === 'reload') {
+            return undefined;
+        }
+        const entry = __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").get(key);
+        if (!entry || entry.requestTime + __classPrivateFieldGet(this, _MedplumClient_cacheTime, "f") < Date.now()) {
+            return undefined;
+        }
+        return entry;
+    }, _MedplumClient_setCacheEntry = function _MedplumClient_setCacheEntry(key, value) {
+        if (__classPrivateFieldGet(this, _MedplumClient_cacheTime, "f") > 0) {
+            __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").set(key, { requestTime: Date.now(), value });
+        }
     }, _MedplumClient_request = function _MedplumClient_request(method, url, options = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             if (__classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f")) {
@@ -2402,8 +2264,8 @@
                 return undefined;
             }
             const obj = yield response.json();
-            if ((obj === null || obj === void 0 ? void 0 : obj.resourceType) === 'OperationOutcome' && !isOk(obj)) {
-                return Promise.reject(obj);
+            if (response.status >= 400) {
+                throw obj;
             }
             return obj;
         });
@@ -5192,6 +5054,155 @@
         }
     }
 
+    const OK_ID = 'ok';
+    const CREATED_ID = 'created';
+    const GONE_ID = 'gone';
+    const NOT_MODIFIED_ID = 'not-modified';
+    const NOT_FOUND_ID = 'not-found';
+    const ACCESS_DENIED = 'access-denied';
+    const allOk = {
+        resourceType: 'OperationOutcome',
+        id: OK_ID,
+        issue: [
+            {
+                severity: 'information',
+                code: 'information',
+                details: {
+                    text: 'All OK',
+                },
+            },
+        ],
+    };
+    const created = {
+        resourceType: 'OperationOutcome',
+        id: CREATED_ID,
+        issue: [
+            {
+                severity: 'information',
+                code: 'information',
+                details: {
+                    text: 'Created',
+                },
+            },
+        ],
+    };
+    const notModified = {
+        resourceType: 'OperationOutcome',
+        id: NOT_MODIFIED_ID,
+        issue: [
+            {
+                severity: 'information',
+                code: 'information',
+                details: {
+                    text: 'Not Modified',
+                },
+            },
+        ],
+    };
+    const notFound = {
+        resourceType: 'OperationOutcome',
+        id: NOT_FOUND_ID,
+        issue: [
+            {
+                severity: 'error',
+                code: 'not-found',
+                details: {
+                    text: 'Not found',
+                },
+            },
+        ],
+    };
+    const gone = {
+        resourceType: 'OperationOutcome',
+        id: GONE_ID,
+        issue: [
+            {
+                severity: 'error',
+                code: 'gone',
+                details: {
+                    text: 'Gone',
+                },
+            },
+        ],
+    };
+    const accessDenied = {
+        resourceType: 'OperationOutcome',
+        id: ACCESS_DENIED,
+        issue: [
+            {
+                severity: 'error',
+                code: 'access-denied',
+                details: {
+                    text: 'Access Denied',
+                },
+            },
+        ],
+    };
+    function badRequest(details, expression) {
+        return {
+            resourceType: 'OperationOutcome',
+            issue: [
+                {
+                    severity: 'error',
+                    code: 'invalid',
+                    details: {
+                        text: details,
+                    },
+                    expression: expression ? [expression] : undefined,
+                },
+            ],
+        };
+    }
+    function isOk(outcome) {
+        return outcome.id === OK_ID || outcome.id === CREATED_ID || outcome.id === NOT_MODIFIED_ID;
+    }
+    function isNotFound(outcome) {
+        return outcome.id === NOT_FOUND_ID;
+    }
+    function isGone(outcome) {
+        return outcome.id === GONE_ID;
+    }
+    function getStatus(outcome) {
+        if (outcome.id === OK_ID) {
+            return 200;
+        }
+        else if (outcome.id === CREATED_ID) {
+            return 201;
+        }
+        else if (outcome.id === NOT_MODIFIED_ID) {
+            return 304;
+        }
+        else if (outcome.id === ACCESS_DENIED) {
+            return 403;
+        }
+        else if (outcome.id === NOT_FOUND_ID) {
+            return 404;
+        }
+        else if (outcome.id === GONE_ID) {
+            return 410;
+        }
+        else {
+            return 400;
+        }
+    }
+    /**
+     * Asserts that the operation completed successfully and that the resource is defined.
+     * @param outcome The operation outcome.
+     * @param resource The resource that may or may not have been returned.
+     */
+    function assertOk(outcome, resource) {
+        if (!isOk(outcome) || resource === undefined) {
+            throw new OperationOutcomeError(outcome);
+        }
+    }
+    class OperationOutcomeError extends Error {
+        constructor(outcome) {
+            var _a, _b;
+            super((_b = (_a = outcome === null || outcome === void 0 ? void 0 : outcome.issue) === null || _a === void 0 ? void 0 : _a[0].details) === null || _b === void 0 ? void 0 : _b.text);
+            this.outcome = outcome;
+        }
+    }
+
     const DEFAULT_SEARCH_COUNT = 20;
     /**
      * Search operators.