@medplum/core 0.9.15 → 0.9.16

package/dist/esm/index.js

@@ -1178,10 +1178,11 @@ function getPropertyDisplayName(property) {
 
 // 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';
@@ -1234,7 +1235,7 @@ const PATCH_CONTENT_TYPE = 'application/json-patch+json';
  */
 class MedplumClient extends EventTarget {
     constructor(options) {
-        var _a;
+        var _a, _b;
         super();
         _MedplumClient_instances.add(this);
         _MedplumClient_fetch.set(this, void 0);
@@ -1242,6 +1243,7 @@ class MedplumClient extends EventTarget {
         _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);
@@ -1267,6 +1269,7 @@ class MedplumClient extends EventTarget {
         __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");
@@ -1335,14 +1338,12 @@ class MedplumClient extends EventTarget {
      */
     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;
     }
     /**
@@ -1582,14 +1583,12 @@ class MedplumClient extends EventTarget {
         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;
     }
     /**
@@ -1614,14 +1613,12 @@ class MedplumClient extends EventTarget {
     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;
     }
     /**
@@ -1644,7 +1641,8 @@ class MedplumClient extends EventTarget {
      * @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;
     }
     /**
@@ -2208,7 +2206,7 @@ class MedplumClient extends EventTarget {
         });
     }
 }
-_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);
@@ -2227,6 +2225,19 @@ _MedplumClient_fetch = new WeakMap(), _MedplumClient_createPdf = new WeakMap(),
         }), "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")) {