fhirsmith 0.9.6 → 0.10.0

package/registry/registry.js

@@ -758,7 +758,7 @@ class RegistryModule {
       case '11000267109': edition = 'KR'; break;
       case '900000001000122104': edition = 'ES-ES'; break;
       case '2011000195101': edition = 'CH'; break;
-      case '11000279109': edition = 'CX'; break;
+      case '11000279109': edition = 'CZ'; break;
       case '999000021000000109': edition = 'UK+Clinical'; break;
       case '5631000179106': edition = 'UY'; break;
       case '21000325107': edition = 'CL'; break;
@@ -976,7 +976,15 @@ class RegistryModule {
 
       try {
         const params = this._normalizeQueryParams(req.query);
-        const {fhirVersion, url, valueSet, usage} = params;
+        const {fhirVersion, valueSet, usage, version} = params;
+        let {url} = params;
+
+        // If a version was supplied separately, fold it into the code system
+        // URL using the canonical url|version syntax that the resolver expects.
+        // Don't double up if the caller already encoded a version in the url.
+        if (version && url && !url.includes('|')) {
+          url = `${url}|${version}`;
+        }
 
         // Convert authoritativeOnly to boolean
         const authoritativeOnly = params.authoritativeOnly === 'true';
@@ -1219,6 +1227,7 @@ class RegistryModule {
   buildResolveFormContent(queryParams = {}) {
     const fhirVersion = queryParams.fhirVersion || '';
     const url = queryParams.url || '';
+    const version = queryParams.version || '';
     const valueSet = queryParams.valueSet || '';
     const authoritativeOnly = queryParams.authoritativeOnly === 'true';
 
@@ -1233,7 +1242,7 @@ class RegistryModule {
     // FHIR Version field
     html += '<p>';
     html += '<label for="fhirVersion" class="form-label fw-bold">FHIR Version <span class="text-danger">*</span></label>';
-    html += `<input type="text" class="form-control" id="fhirVersion" name="fhirVersion" size="8" 
+    html += `<input type="text" class="form-control" id="fhirVersion" name="fhirVersion" size="8"
            value="${escape(fhirVersion)}" required>`;
     html += '</p>';
     html += '<p class="text-muted small">Examples: R4, 4.0.1, 5.0.0, etc.</p>';
@@ -1241,15 +1250,23 @@ class RegistryModule {
     html += '<div class="alert alert-info">Either Code System URL or Value Set URL must be provided:</div>';
     html += '<p>';
     html += '<label for="url" class="form-label fw-bold">Code System URL</label>';
-    html += `<input type="url" class="form-control" id="url" name="url" 
+    html += `<input type="url" class="form-control" id="url" name="url"
            value="${escape(url)}">`;
     html += '</p>';
     html += '<p class="text-muted small">Example: http://loinc.org</p>';
 
+    // Code System Version field (optional)
+    html += '<p>';
+    html += '<label for="version" class="form-label fw-bold">Code System Version</label>';
+    html += `<input type="text" class="form-control" id="version" name="version"
+           value="${escape(version)}">`;
+    html += '</p>';
+    html += '<p class="text-muted small">Optional. Example: 2.74 (combined with the Code System URL as url|version)</p>';
+
     // ValueSet URL field - now vertical
     html += '<p>';
     html += '<label for="valueSet" class="form-label fw-bold">Value Set URL</label>';
-    html += `<input type="url" class="form-control" id="valueSet" name="valueSet" 
+    html += `<input type="url" class="form-control" id="valueSet" name="valueSet"
            value="${escape(valueSet)}">`;
     html += '</p>';
     html += '<p class="text-muted small">Example: http://hl7.org/fhir/ValueSet/observation-codes</p>';
@@ -1257,7 +1274,7 @@ class RegistryModule {
 
     // Authoritative Only checkbox
     html += '<p>';
-    html += `<input type="checkbox" class="form-check-input" id="authoritativeOnly" 
+    html += `<input type="checkbox" class="form-check-input" id="authoritativeOnly"
            name="authoritativeOnly" value="true" ${authoritativeOnly ? 'checked' : ''}>`;
     html += '<label class="form-check-label" for="authoritativeOnly">&nbsp;Show only authoritative servers</label>';
     html += '</p>';
@@ -1276,7 +1293,7 @@ class RegistryModule {
     document.querySelector('form').addEventListener('submit', function(e) {
       const url = document.getElementById('url').value.trim();
       const valueSet = document.getElementById('valueSet').value.trim();
-      
+
       if (!url && !valueSet) {
         e.preventDefault();
         alert('You must provide either a Code System URL or a Value Set URL');

package/server.js

@@ -7,7 +7,7 @@
 //
 
 const express = require('express');
-// const cors = require('cors');
+const cors = require('cors');
 const path = require('path');
 const fs = require('fs');
 const os = require('os');
@@ -82,7 +82,11 @@ app.use((req, res, next) => {
   next();
 });
 
-// app.use(cors(config.server.cors));
+// Single, app-level CORS policy for all modules, driven by config.server.cors.
+// This also handles OPTIONS preflight, so modules must NOT set their own
+// Access-Control-* headers (doing so stacks a second CORS layer and produces
+// duplicate, conflicting headers that browsers reject).
+app.use(cors(config.server.cors));
 
 // Module instances
 const modules = {};
@@ -426,6 +430,11 @@ async function buildRootPageContent() {
   content += `<td style="background-color:${pctColor(processPCT)}"><strong>Process Memory:</strong> ${rssMB} MB of ${memLimitMB} MB (${processPCT.toFixed(0)}%)</td>`;
   content += `<td style="background-color:${pctColor(sysMemPCT)}"><strong>System Memory:</strong> ${usedMemMB} MB of ${totalMemMB} MB (${sysMemPCT.toFixed(0)}%)</td>`;
   content += '</tr>';
+  content += '<tr>';
+  content += `<td><strong>Expansion Cache:</strong> ${stats.expansionItems()} items</td>`;
+  content += `<td><strong>Client Cache:</strong> ${stats.clientCaches()} caches / ${stats.clientConcepts()} concepts</td>`;
+  content += `<td><strong>Max Client Cache:</strong> ${stats.maxClientCaches()} caches / ${stats.maxClientConcepts()} concepts</td>`;
+  content += '</tr>';
   content += getLogStats();
   content += '</table>';
 

package/stats.js

@@ -36,24 +36,26 @@ class ServerStats {
         : (now - this.startTime) / 60000;
       const requestsPerMin = minutesSinceStart > 0 ? requestsDelta / minutesSinceStart : 0;
 
-      const currentCpu = this.readSystemCpu();
-      const idleDelta = currentCpu.idle - this.lastUsage.idle;
-      const totalDelta = currentCpu.total - this.lastUsage.total;
-      const percent = totalDelta > 0 ? 100 * (1 - idleDelta / totalDelta) : 0;
-
       const loopDelay = this.eventLoopMonitor.mean / 1e6;
-      let cacheCount = 0;
+      // Two distinct caches: the expansion cache (count entries) and the client
+      // (resource) cache (count concepts held - a sense of how much it's carrying).
+      let expansionItems = 0;
+      let clientConcepts = 0;
       for (let m of this.cachingModules) {
-        cacheCount = cacheCount + m.cacheCount();
+        if (typeof m.expansionItemCount === 'function') {
+          expansionItems = expansionItems + m.expansionItemCount();
+        }
+        if (typeof m.clientConceptCount === 'function') {
+          clientConcepts = clientConcepts + m.clientConceptCount();
+        }
       }
 
-      this.history.push({time: now, mem: currentMem - this.startMem, rpm: requestsPerMin, tat: requestsTat, cpu: percent, block: loopDelay, cache : cacheCount});
+      this.history.push({time: now, mem: currentMem - this.startMem, rpm: requestsPerMin, tat: requestsTat, block: loopDelay, expansion: expansionItems, clientConcepts: clientConcepts});
 
       this.eventLoopMonitor.reset();
       this.requestCountSnapshot = combinedCount;
       this.requestTime = 0;
       this.lastTime = now;
-      this.lastUsage = currentCpu;
 
       // Prune old data (keep 24 hours)
       const cutoff = now - (24 * 60 * 60 * 1000); // 24 hours ago
@@ -65,7 +67,6 @@ class ServerStats {
     this.started = true;
     this.startMem = process.memoryUsage().heapUsed;
     this.startTime = Date.now();
-    this.lastUsage = this.readSystemCpu();
     this.lastTime = this.startTime;
     this.eventLoopMonitor = monitorEventLoopDelay({ resolution: 20 });
     this.eventLoopMonitor.enable();
@@ -141,17 +142,24 @@ class ServerStats {
     clearInterval(this.timer);
   }
 
-  readSystemCpu() {
-    const os = require('os');
-    const cpus = os.cpus();
-    let idle = 0, total = 0;
-    for (const cpu of cpus) {
-      idle += cpu.times.idle;
-      total += cpu.times.user + cpu.times.nice + cpu.times.sys + cpu.times.idle + cpu.times.irq;
+  // Live cache aggregates across all registered caching modules (defensive: a
+  // module that doesn't expose a given metric contributes 0).
+  _sumCachingModules(method) {
+    let total = 0;
+    for (let m of this.cachingModules) {
+      if (typeof m[method] === 'function') {
+        total = total + m[method]();
+      }
     }
-    return { idle, total };
+    return total;
   }
 
+  expansionItems() { return this._sumCachingModules('expansionItemCount'); }
+  clientCaches() { return this._sumCachingModules('clientCacheCount'); }
+  clientConcepts() { return this._sumCachingModules('clientConceptCount'); }
+  maxClientCaches() { return this._sumCachingModules('maxClientCacheCount'); }
+  maxClientConcepts() { return this._sumCachingModules('maxClientConceptCount'); }
+
   getTaskColor(status) {
     switch (status) {
       case "started": return "LightGrey";

package/translations/Messages.properties

@@ -544,7 +544,7 @@ NO_VALID_DISPLAY_FOUND_LANG_NONE_other = ''{5}'' is the default display; the cod
 NO_VALID_DISPLAY_FOUND_LANG_SOME_one = ''{5}'' is the default display; no valid Display Names found for {1}#{2} in the language {4}
 NO_VALID_DISPLAY_FOUND_LANG_SOME_other = ''{5}'' is the default display; no valid Display Names found for {1}#{2} in the language {4}
 NO_VALID_DISPLAY_FOUND_NONE_FOR_LANG_ERR = Wrong Display Name ''{0}'' for {1}#{2}. There are no valid display names found for language(s) ''{3}''. Default display is ''{4}''
-NO_VALID_DISPLAY_FOUND_NONE_FOR_LANG_OK = There are no valid display names found for the code {1}#{2} for language(s) ''{3}''. The display is ''{4}'' which is the default language display
+NO_VALID_DISPLAY_FOUND_NONE_FOR_LANG_OK = There are no valid display names found for the code {1}#{2} for language(s) ''{3}''. The display is ''{0}'' which is a valid display for the default language
 NO_VALID_DISPLAY_FOUND_one = No valid Display Names found for {1}#{2} in the language {4}
 NO_VALID_DISPLAY_FOUND_other = No valid Display Names found for {1}#{2} in the languages {4}
 No_validator_configured = No validator configured
@@ -1100,6 +1100,7 @@ Unable_to_resolve_system__value_set_has_multiple_matches = The System URI could
 Unable_to_resolve_system__value_set_has_no_includes_or_expansion = The System URI could not be determined for the code ''{0}'' in the ValueSet ''{1}'': value set has no includes or expansion
 UNABLE_TO_RESOLVE_SYSTEM_SYSTEM_IS_INDETERMINATE = The code system {1} referred to from value set {0} has a grammar, and the code might be valid in it
 Unable_to_resolve_value_Set_ = A definition for the value Set ''{0}'' could not be found
+CACHE_ID_UNKNOWN = The cache ''{0}'' is not known to this server. Caches are created with $cache-control?mode=start; this one was never created, or has expired or been released
 Unable_to_validate_code_without_using_server = Unable to validate code without using server because: {0}
 Undefined_attribute__on__for_type__properties__ = Undefined attribute ''@{0}'' on {1} for type {2}
 Undefined_element_ = Undefined element ''{0}'' at {1}

package/tx/cs/cs-cs.js

@@ -1140,6 +1140,7 @@ class FhirCodeSystemProvider extends BaseCSServices {
     const allConcepts = this.codeSystem.getAllConcepts();
 
     for (const concept of allConcepts) {
+      this.opContext.deadCheck('cs:searchFilter');
       const rating = this._calculateSearchRating(concept, searchTerm);
       if (rating > 0) {
         results.add(concept, rating);
@@ -1285,6 +1286,7 @@ class FhirCodeSystemProvider extends BaseCSServices {
 
       const allCodes = this.codeSystem.getAllCodes();
       for (const code of allCodes) {
+        this.opContext.deadCheck('cs:conceptFilter:is-not-a');
         if (!excludeSet.has(code)) {
           const concept = this.codeSystem.getConceptByCode(code);
           if (concept) {
@@ -1316,6 +1318,7 @@ class FhirCodeSystemProvider extends BaseCSServices {
         const regex = regexUtilities.compile('^' + value + '$');
         const allCodes = this.codeSystem.getAllCodes();
         for (const code of allCodes) {
+          this.opContext.deadCheck('cs:conceptFilter:regex');
           if (regex.test(code)) {
             const concept = this.codeSystem.getConceptByCode(code);
             if (concept) {
@@ -1349,6 +1352,7 @@ class FhirCodeSystemProvider extends BaseCSServices {
       }
       const descendants = this.codeSystem.getDescendants(ancestorCode);
       for (const code of descendants) {
+        this.opContext.deadCheck('cs:addDescendants');
         if (code !== ancestorCode) {
           const concept = this.codeSystem.getConceptByCode(code);
           if (concept) {
@@ -1370,6 +1374,7 @@ class FhirCodeSystemProvider extends BaseCSServices {
     if (concept) {
       const descendants = this.codeSystem.getChildren(parentCode);
       for (const code of descendants) {
+        this.opContext.deadCheck('cs:addChildren');
         if (code !== parentCode) { // should not be
           const concept = this.codeSystem.getConceptByCode(code);
           if (concept) {
@@ -1393,6 +1398,7 @@ class FhirCodeSystemProvider extends BaseCSServices {
 
     const allCodes = this.codeSystem.getAllCodes();
     for (const code of allCodes) {
+      this.opContext.deadCheck('cs:childExistsFilter');
       const hasChildren = this.codeSystem.getChildren(code).length > 0;
       if (hasChildren === wantChildren) {
         const concept = this.codeSystem.getConceptByCode(code);
@@ -1419,6 +1425,7 @@ class FhirCodeSystemProvider extends BaseCSServices {
     const allConcepts = this.codeSystem.getAllConcepts();
 
     for (const concept of allConcepts) {
+      this.opContext.deadCheck('cs:propertyFilter');
       if (this._conceptMatchesPropertyFilter(concept, propertyDef, op, value)) {
         results.add(concept, 0);
       }
@@ -1498,6 +1505,7 @@ class FhirCodeSystemProvider extends BaseCSServices {
     const allConcepts = this.codeSystem.getAllConcepts();
 
     for (const concept of allConcepts) {
+      this.opContext.deadCheck('cs:knownPropertyFilter');
       let matches = false;
 
       if (prop === 'notSelectable') {

package/tx/cs/cs-loinc.js

@@ -947,6 +947,7 @@ class LoincServices extends BaseCSServices {
           reject(err);
         } else {
           for (const row of rows) {
+            if (this.opContext) this.opContext.deadCheck('loinc:findRegexMatches');
             if (regex.test(row[valueColumn])) {
               matchingKeys.push(row[keyColumn]);
             }

package/tx/cs/cs-provider-list.js

@@ -5,7 +5,8 @@ const { AbstractCodeSystemProvider } = require('./cs-provider-api');
  */
 class ListCodeSystemProvider extends AbstractCodeSystemProvider {
   /**
-   * {Map<String, CodeSystem>} A list of code system factories that contains all the preloaded native code systems
+   * {CodeSystem[]} The preloaded FHIR code systems in this list. This is an
+   * array — append with .push(), not Map-style .set().
    */
   codeSystems = [];