fhirsmith 0.7.6 → 0.8.2

package/tx/vs/vs-database.js

@@ -33,12 +33,31 @@ class ValueSetDatabase {
       db.all("PRAGMA table_info(valuesets)", [], (err, cols) => {
         if (err) { reject(err); return; }
         const hasCol = cols.some(c => c.name === 'date_first_seen');
-        if (hasCol) { resolve(); return; }
-        db.run(
-          "ALTER TABLE valuesets ADD COLUMN date_first_seen INTEGER DEFAULT 0",
-          [],
-          (err) => err ? reject(err) : resolve()
-        );
+        const migrations = [];
+        if (!hasCol) {
+          migrations.push(new Promise((res, rej) => {
+            db.run(
+              "ALTER TABLE valuesets ADD COLUMN date_first_seen INTEGER DEFAULT 0",
+              [],
+              (err) => err ? rej(err) : res()
+            );
+          }));
+        }
+        // Ensure vsac_runs table exists
+        migrations.push(new Promise((res, rej) => {
+          db.run(`
+            CREATE TABLE IF NOT EXISTS vsac_runs (
+              id INTEGER PRIMARY KEY AUTOINCREMENT,
+              started_at INTEGER NOT NULL,
+              finished_at INTEGER,
+              status TEXT NOT NULL DEFAULT 'running',
+              error_message TEXT,
+              total_fetched INTEGER,
+              total_new INTEGER
+            )
+          `, [], (err) => err ? rej(err) : res());
+        }));
+        Promise.all(migrations).then(() => resolve()).catch(reject);
       });
     });
   }
@@ -204,6 +223,19 @@ class ValueSetDatabase {
               )
           `);
 
+          // Run tracking table
+          db.run(`
+              CREATE TABLE vsac_runs (
+                                         id INTEGER PRIMARY KEY AUTOINCREMENT,
+                                         started_at INTEGER NOT NULL,
+                                         finished_at INTEGER,
+                                         status TEXT NOT NULL DEFAULT 'running',
+                                         error_message TEXT,
+                                         total_fetched INTEGER,
+                                         total_new INTEGER
+              )
+          `);
+
           // Create indexes for better search performance
           db.run('CREATE INDEX idx_valuesets_url ON valuesets(url, version)');
           db.run('CREATE INDEX idx_valuesets_version ON valuesets(version)');
@@ -231,6 +263,58 @@ class ValueSetDatabase {
     });
   }
 
+  /**
+   * Record the start of a VSAC sync run
+   * @returns {Promise<number>} The run ID
+   */
+  async startRun() {
+    const db = await this._getWriteConnection();
+    return new Promise((resolve, reject) => {
+      db.run(
+        `INSERT INTO vsac_runs (started_at, status) VALUES (strftime('%s','now'), 'running')`,
+        [],
+        function(err) { err ? reject(err) : resolve(this.lastID); }
+      );
+    });
+  }
+
+  /**
+   * Record the successful completion of a VSAC sync run
+   * @param {number} id - The run ID from startRun()
+   * @param {number} totalFetched - Total value sets fetched
+   * @param {number} totalNew - Number of new value sets found
+   * @returns {Promise<void>}
+   */
+  async finishRun(id, totalFetched, totalNew) {
+    const db = await this._getWriteConnection();
+    return new Promise((resolve, reject) => {
+      db.run(
+        `UPDATE vsac_runs SET finished_at = strftime('%s','now'), status = 'ok',
+         total_fetched = ?, total_new = ? WHERE id = ?`,
+        [totalFetched, totalNew, id],
+        err => err ? reject(err) : resolve()
+      );
+    });
+  }
+
+  /**
+   * Record a failed VSAC sync run
+   * @param {number} id - The run ID from startRun()
+   * @param {string} errorMessage - The error message
+   * @returns {Promise<void>}
+   */
+  async failRun(id, errorMessage) {
+    const db = await this._getWriteConnection();
+    return new Promise((resolve, reject) => {
+      db.run(
+        `UPDATE vsac_runs SET finished_at = strftime('%s','now'), status = 'error',
+         error_message = ? WHERE id = ?`,
+        [errorMessage, id],
+        err => err ? reject(err) : resolve()
+      );
+    });
+  }
+
   /**
    * Insert or update a single ValueSet in the database
    * @param {Object} valueSet - The ValueSet resource
@@ -270,23 +354,23 @@ class ValueSetDatabase {
 
             db.run(`
                 INSERT INTO valuesets (
-                id, url, version, date, description, effectivePeriod_start, effectivePeriod_end,
-                expansion_identifier, name, publisher, status, title, content, last_seen, date_first_seen
-              ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, strftime('%s', 'now'), strftime('%s', 'now'))
-              ON CONFLICT(id) DO UPDATE SET
-                url=excluded.url,
-                version=excluded.version,
-                date=excluded.date,
-                description=excluded.description,
-                effectivePeriod_start=excluded.effectivePeriod_start,
-                effectivePeriod_end=excluded.effectivePeriod_end,
-                expansion_identifier=excluded.expansion_identifier,
-                name=excluded.name,
-                publisher=excluded.publisher,
-                status=excluded.status,
-                title=excluded.title,
-                content=excluded.content,
-                last_seen=strftime('%s', 'now')
+                    id, url, version, date, description, effectivePeriod_start, effectivePeriod_end,
+                    expansion_identifier, name, publisher, status, title, content, last_seen, date_first_seen
+                ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, strftime('%s', 'now'), strftime('%s', 'now'))
+                    ON CONFLICT(id) DO UPDATE SET
+                    url=excluded.url,
+                                           version=excluded.version,
+                                           date=excluded.date,
+                                           description=excluded.description,
+                                           effectivePeriod_start=excluded.effectivePeriod_start,
+                                           effectivePeriod_end=excluded.effectivePeriod_end,
+                                           expansion_identifier=excluded.expansion_identifier,
+                                           name=excluded.name,
+                                           publisher=excluded.publisher,
+                                           status=excluded.status,
+                                           title=excluded.title,
+                                           content=excluded.content,
+                                           last_seen=strftime('%s', 'now')
             `, [
               valueSet.id,
               valueSet.url,

package/tx/vs/vs-vsac.js

@@ -98,6 +98,7 @@ class VSACValueSetProvider extends AbstractValueSetProvider {
       try {
         await this.refreshValueSets();
       } catch (error) {
+        debugLog(error);
         this.log.error(error, 'Error during scheduled refresh:');
       }
     }, intervalMs);
@@ -126,6 +127,7 @@ class VSACValueSetProvider extends AbstractValueSetProvider {
     this.queue = [];
 
     this.isRefreshing = true;
+    const runId = await this.database.startRun();
 
     try {
       // phase 1: list all value sets
@@ -202,10 +204,15 @@ class VSACValueSetProvider extends AbstractValueSetProvider {
 
       // Reload map with fresh data
       await this._reloadMap();
-      console.log(`VSAC refresh completed. Total: ${tracking.totalFetched} ValueSets, Deleted: ${tracking.deletedCount}`);
+      let msg = `VSAC refresh completed. Total: ${tracking.totalFetched} ValueSets, Deleted: ${tracking.deletedCount}`;
+      this.stats.taskDone('VSAC Sync', msg);
+      console.log(msg);
+
+      await this.database.finishRun(runId, tracking.totalFetched, tracking.totalNew);
     } catch (error) {
       debugLog(error, 'Error during VSAC refresh:');
-      this.stats.task('VSAC Sync', `Error (${error.message})`);
+      this.stats.taskError('VSAC Sync', `Error (${error.message})`);
+      await this.database.failRun(runId, error.message);
       throw error;
     } finally {
       this.isRefreshing = false;
@@ -265,7 +272,6 @@ class VSACValueSetProvider extends AbstractValueSetProvider {
     }
   }
 
-
   /**
    * Fetch a FHIR Bundle from the server
    * @param {string} url - Relative URL to fetch
@@ -511,7 +517,6 @@ class VSACValueSetProvider extends AbstractValueSetProvider {
     let logMsg = `VSAC (${tracking.count} of ${length}) ${q}: ${vcount} versions`;
     console.log(logMsg);
     this.stats.task('VSAC Sync', logMsg);
-
   }
 
   name() {
@@ -523,35 +528,77 @@ class VSACValueSetProvider extends AbstractValueSetProvider {
   }
 
   async info() {
+    const escape = require('escape-html');
     const db = await this.database._getReadConnection();
+
     const rows = await new Promise((resolve, reject) => {
       db.all(
-        `SELECT url, version, date_first_seen
+        `SELECT 'vs' AS kind,
+                url,
+                version,
+                date_first_seen AS ts,
+                NULL AS status,
+                NULL AS error_message,
+                NULL AS finished_at,
+                NULL AS total_fetched,
+                NULL AS total_new
            FROM valuesets
           WHERE date_first_seen > 0
-          ORDER BY date_first_seen DESC
-          LIMIT 100`,
+         UNION ALL
+         SELECT 'run' AS kind,
+                NULL,
+                NULL,
+                started_at AS ts,
+                status,
+                error_message,
+                finished_at,
+                total_fetched,
+                total_new
+           FROM vsac_runs
+         ORDER BY ts DESC
+         LIMIT 200`,
         [],
         (err, rows) => err ? reject(err) : resolve(rows)
       );
     });
 
-    const escape = require('escape-html');
-    let html = '<h3>Recently Value Sets Added to VSAC</h3>';
-    html += '<p>The last ' + rows.length + ' value sets found from VSAC, most recent first.</p>';
+    const fmt = ts => ts
+      ? new Date(ts * 1000).toISOString().replace('T', ' ').substring(0, 19) + ' UTC'
+      : '—';
+
+    let html = '<h3>VSAC Sync History</h3>';
     html += '<table class="grid">';
-    html += '<thead><tr><th>URL</th><th>Version</th><th>Date Observed</th></tr></thead>';
+    html += '<thead><tr><th>Time</th><th>Event</th><th>Detail</th></tr></thead>';
     html += '<tbody>';
+
     for (const row of rows) {
-      const date = row.date_first_seen
-        ? new Date(row.date_first_seen * 1000).toISOString().replace('T', ' ').substring(0, 19) + ' UTC'
-        : 'unknown';
-      html += '<tr>';
-      html += `<td>${escape(row.url || '')}</td>`;
-      html += `<td>${escape(row.version || '')}</td>`;
-      html += `<td>${escape(date)}</td>`;
-      html += '</tr>';
+      if (row.kind === 'run') {
+        const duration = row.finished_at ? `${row.finished_at - row.ts}s` : 'in progress';
+        let detail, colour;
+        if (row.status === 'ok') {
+          detail = `${row.total_fetched} fetched, ${row.total_new} new, ${duration}`;
+          colour = 'green';
+        } else if (row.status === 'error') {
+          detail = `Failed: ${escape(row.error_message || '')} (${duration})`;
+          colour = 'red';
+        } else {
+          detail = `Running... (started ${fmt(row.ts)})`;
+          colour = 'orange';
+        }
+        html += `<tr style="background:#f0f0f0">`;
+        html += `<td>${escape(fmt(row.ts))}</td>`;
+        html += `<td><strong style="color:${colour}">Sync run</strong></td>`;
+        html += `<td>${detail}</td>`;
+        html += `</tr>`;
+      } else {
+        html += `<tr>`;
+        html += `<td>${escape(fmt(row.ts))}</td>`;
+        html += `<td>New value set</td>`;
+        html += `<td>${escape(row.url || '')}#${escape(row.version || '')}</td>`;
+        html += `</tr>`;
+      }
     }
+
     html += '</tbody></table>';
     return html;
   }

package/tx/workers/expand.js

@@ -604,7 +604,7 @@ class ValueSetExpander {
 
   async checkSource(cset, exp, filter, srcURL, ts, vsInfo) {
     this.worker.deadCheck('checkSource');
-    Extensions.checkNoModifiers(cset, 'ValueSetExpander.checkSource', 'set');
+    Extensions.checkNoModifiers(cset, 'ValueSetExpander.checkSource', 'set', srcURL);
     let imp = false;
     for (const u of cset.valueSet || []) {
       this.worker.deadCheck('checkSource');
@@ -682,7 +682,7 @@ class ValueSetExpander {
     this.worker.deadCheck('processCodes#1');
     const valueSets = [];
 
-    Extensions.checkNoModifiers(cset, 'ValueSetExpander.processCodes', 'set');
+    Extensions.checkNoModifiers(cset, 'ValueSetExpander.processCodes', 'set', vsSrc.vurl);
 
     if (cset.valueSet || cset.concept || (cset.filter || []).length > 1) {
       this.canBeHierarchy = false;
@@ -792,7 +792,7 @@ class ValueSetExpander {
           for (const cc of cset.concept) {
             this.worker.deadCheck('processCodes#3');
             cds.clear();
-            Extensions.checkNoModifiers(cc, 'ValueSetExpander.processCodes', 'set concept reference');
+            Extensions.checkNoModifiers(cc, 'ValueSetExpander.processCodes', 'set concept reference', vsSrc.vurl);
             const cctxt = await cs.locate(cc.code, this.allAltCodes);
             if (cctxt && cctxt.context && (!this.params.activeOnly || !await cs.isInactive(cctxt.context)) && await this.passesFilters(cs, cctxt.context, prep, filters, 0)) {
               await this.listDisplaysFromProvider(cds, cs, cctxt.context);
@@ -834,7 +834,7 @@ class ValueSetExpander {
             if (!fc.value) {
               throw new Issue('error', 'invalid', path + ".filter[" + i + "]", 'UNABLE_TO_HANDLE_SYSTEM_FILTER_WITH_NO_VALUE', this.worker.i18n.translate('UNABLE_TO_HANDLE_SYSTEM_FILTER_WITH_NO_VALUE', this.params.httpLanguages, [cs.system(), fc.property, fc.op]), 'vs-invalid', 400);
             }
-            Extensions.checkNoModifiers(fc, 'ValueSetExpander.processCodes', 'filter');
+            Extensions.checkNoModifiers(fc, 'ValueSetExpander.processCodes', 'filter', vsSrc.vurl);
             await cs.filter(prep, fc.property, fc.op, fc.value);
           }
 
@@ -891,7 +891,7 @@ class ValueSetExpander {
     this.worker.deadCheck('processCodes#1');
     const valueSets = [];
 
-    Extensions.checkNoModifiers(cset, 'ValueSetExpander.processCodes', 'set');
+    Extensions.checkNoModifiers(cset, 'ValueSetExpander.processCodes', 'set', vsSrc.vurl);
 
     if (cset.valueSet || cset.concept || (cset.filter || []).length > 1) {
       this.canBeHierarchy = false;
@@ -978,7 +978,7 @@ class ValueSetExpander {
         for (const cc of cset.concept) {
           this.worker.deadCheck('processCodes#3');
           cds.clear();
-          Extensions.checkNoModifiers(cc, 'ValueSetExpander.processCodes', 'set concept reference');
+          Extensions.checkNoModifiers(cc, 'ValueSetExpander.processCodes', 'set concept reference', vsSrc.vurl);
           const cctxt = await cs.locate(cc.code, this.allAltCodes);
           if (cctxt && cctxt.context && (!this.params.activeOnly || !await cs.isInactive(cctxt)) && await this.passesFilters(cs, cctxt, prep, filters, 0)) {
             if (filter.passesDesignations(cds) || filter.passes(cc.code)) {
@@ -1007,7 +1007,7 @@ class ValueSetExpander {
 
         for (let fc of cset.filter) {
           this.worker.deadCheck('processCodes#4a');
-          Extensions.checkNoModifiers(fc, 'ValueSetExpander.processCodes', 'filter');
+          Extensions.checkNoModifiers(fc, 'ValueSetExpander.processCodes', 'filter', vsSrc.vurl);
           await cs.filter(prep, fc.property, fc.op, fc.value);
         }
 
@@ -1157,8 +1157,8 @@ class ValueSetExpander {
     this.totalStatus = 'uninitialised';
     this.total = 0;
 
-    Extensions.checkNoImplicitRules(source,'ValueSetExpander.Expand', 'ValueSet');
-    Extensions.checkNoModifiers(source,'ValueSetExpander.Expand', 'ValueSet');
+    Extensions.checkNoImplicitRules(source,'ValueSetExpander.Expand', 'ValueSet', source.vurl);
+    Extensions.checkNoModifiers(source,'ValueSetExpander.Expand', 'ValueSet', source.vurl);
     this.worker.seeValueSet(source, this.params);
     this.valueSet = source;
 
@@ -1272,7 +1272,7 @@ class ValueSetExpander {
 
     let vsInfo = this.scanValueSet(source.jsonObj.compose);
     try {
-      if (source.jsonObj.compose && Extensions.checkNoModifiers(source.jsonObj.compose, 'ValueSetExpander.Expand', 'compose')
+      if (source.jsonObj.compose && Extensions.checkNoModifiers(source.jsonObj.compose, 'ValueSetExpander.Expand', 'compose', source.vurl)
           && this.worker.checkNoLockedDate(source.url, source.jsonObj.compose)) {
         await this.handleCompose(source, filter, exp, notClosed, vsInfo);
       }

package/tx/workers/related.js

@@ -205,12 +205,12 @@ class RelatedWorker extends TerminologyWorker {
     if (!thisC) {
       return this.makeOutcome("indeterminate", `The ValueSet ${thisVS.vurl} has no compose`);
     }
-    Extensions.checkNoModifiers(thisC, 'RelatedWorker.doRelated', 'compose')
+    Extensions.checkNoModifiers(thisC, 'RelatedWorker.doRelated', 'compose', thisVS.vurl)
     this.checkNoLockedDate(thisVS.vurl, thisC);
     if (!otherC) {
       return this.makeOutcome("indeterminate", `The ValueSet ${otherVS.vurl} has no compose`);
     }
-    Extensions.checkNoModifiers(otherC, 'RelatedWorker.doRelated', 'compose')
+    Extensions.checkNoModifiers(otherC, 'RelatedWorker.doRelated', 'compose', otherVS.vurl)
     this.checkNoLockedDate(otherVS.vurl, otherC);
 
     let systems = new Map(); // tracks whether they are version dependent or not

package/tx/workers/search.js

@@ -35,7 +35,8 @@ class SearchWorker extends TerminologyWorker {
     '_offset', '_count', '_elements', '_sort', '_summary', '_total', '_format',
     'url', 'version', 'content-mode', 'date', 'description',
     'supplements', 'identifier', 'jurisdiction', 'name',
-    'publisher', 'status', 'system', 'title', 'text'
+    'publisher', 'status', 'system', 'title', 'text',
+    'source-system', 'target-system'
   ];
 
   // Summary elements for _summary=true (marked elements per resource type)