fhirsmith 0.10.0 → 0.11.0

package/tx/workers/worker.js

@@ -661,19 +661,42 @@ class TerminologyWorker {
       // specific coded issue rather than silently auto-creating a fresh cache and
       // then failing obscurely later when a by-reference resource can't be found.
       if (!this.opContext.resourceCache.has(cacheId)) {
+        // A comma in the cache-id means the request carried multiple X-Cache-Id
+        // headers (Node joins duplicate headers with ", "): server-minted ids are
+        // single uuids. This happens when a client attaches a new cache-id header
+        // without clearing the old one (e.g. IG publisher builds where a second
+        // client context wrapped the same HTTP client) - report that specifically,
+        // because the generic "unknown cache" message sends people looking for an
+        // expiry problem that isn't there.
+        if (cacheId.includes(',')) {
+          throw new Issue('error', 'invalid', null, 'CACHE_ID_DUPLICATE',
+            `The request carried multiple ${CACHE_ID_HEADER} headers (combined value '${cacheId}'). ` +
+            'This is a client error: each request must carry exactly one cache-id. It usually means the client ' +
+            'started a second cache on a connection that already had one, without removing the first header.',
+            'cache-id-duplicate', 400);
+        }
         throw new Issue('error', 'not-found', null, 'CACHE_ID_UNKNOWN',
           this.i18n.translate('CACHE_ID_UNKNOWN', this.opContext.langs, [cacheId]),
           'cache-id-unknown', 404);
       }
 
-      // The cache exists: merge any resources supplied on this request into it
-      // (incremental population is allowed), then expose the full cache contents.
-      const toCache = txResources.concat(primaryResources);
-      if (toCache.length > 0) {
-        this.opContext.resourceCache.add(cacheId, toCache);
+      // The cache exists. If it is unsealed, merge any resources supplied on this
+      // request into it (incremental population). If it is sealed, the cache is
+      // fixed at what it was created with: resources supplied now are still used
+      // for this request (via additionalResources below) but are NOT added to the
+      // shared cache, so a sealed cache never grows.
+      if (!this.opContext.resourceCache.isSealed(cacheId)) {
+        const toCache = txResources.concat(primaryResources);
+        if (toCache.length > 0) {
+          this.opContext.resourceCache.add(cacheId, toCache);
+        }
+        this.additionalResources = this.opContext.resourceCache.get(cacheId);
+      } else {
+        // Sealed: expose the cache contents plus this request's own inline
+        // resources (used for this call only), without mutating the cache.
+        this.additionalResources = this.opContext.resourceCache.get(cacheId)
+          .concat(txResources, primaryResources);
       }
-
-      this.additionalResources = this.opContext.resourceCache.get(cacheId);
       this.additionalResourcesCacheId = cacheId;
     } else {
       // No cache-id, just use the tx-resources directly

package/tx/xversion/xv-valueset.js

@@ -131,9 +131,12 @@ function valueSetR5ToR4(r5Obj) {
         });
       }
       delete exp.property;
-      convertContainsPropertyR5ToR4(exp.contains);
-
     }
+
+    // ValueSet.expansion.contains.property is R5-only too, and must be converted
+    // whether or not the expansion declares expansion-level property definitions:
+    // a contained code can carry a property with no expansion.property present.
+    convertContainsPropertyR5ToR4(exp.contains);
   }
 
   return r5Obj;

package/xig/xig.js

@@ -977,7 +977,7 @@ async function fetchResourceRows(queryParams, offset = 0, limit = 200) {
 }
 
 function rowToObject(row, queryParams) {
-  const { ver, realm, auth, type, rt } = queryParams;
+  const { type } = queryParams;
   const packageObj = getPackage(row.PackageKey);
 
   const obj = {
@@ -3156,7 +3156,7 @@ async function initializeXigModule(stats, xigConfig) {
     if (!fs.existsSync(XIG_DB_PATH)) {
       xigLog.info('No existing XIG database found, triggering initial download');
       setTimeout(() => {
-        updateXigDatabase();
+        updateXigDatabase().catch((err) => xigLog.error('XIG database update failed: ' + err.message));
       }, 5000);
     }
 
@@ -3167,7 +3167,7 @@ async function initializeXigModule(stats, xigConfig) {
     // Note: This assumes we're called only when XIG is enabled
     if (xigConfig?.autoUpdate !== false) {
       cron.schedule('0 2 * * *', () => {
-        updateXigDatabase();
+        updateXigDatabase().catch((err) => xigLog.error('XIG database update failed: ' + err.message));
       });
     }