fhirsmith 0.18.1 → 1.0.0

package/static/assets/css/bootstrap-fhir.css

@@ -295,8 +295,8 @@ textarea {
   line-height: inherit;
 }
 a {
-  color: #428bca;
-  text-decoration: none;
+  color: #1f4465;
+  text-decoration: underline;
 }
 a:hover,
 a:focus {
@@ -349,19 +349,19 @@ cite {
   font-style: normal;
 }
 .text-muted {
-  color: #999999;
+  color: #727272;
 }
 .text-primary {
-  color: #428bca;
+  color: #2c6597;
 }
 .text-warning {
-  color: #c09853;
+  color: #92681e;
 }
 .text-danger {
   color: #b94a48;
 }
 .text-success {
-  color: #468847;
+  color: #356735;
 }
 .text-info {
   color: #3a87ad;
@@ -1463,7 +1463,7 @@ fieldset[disabled] .btn-default.active {
 }
 .btn-primary {
   color: #ffffff;
-  background-color: #428bca;
+  background-color: #2c618f;
   border-color: #428bca;
 }
 .btn-primary:hover,
@@ -2853,7 +2853,7 @@ button.close {
 }
 .pagination > .active > a,
 .pagination > .active > span {
-  color: #999999;
+  color: #565656;
   cursor: default;
 }
 .pagination > .disabled > span,
@@ -3310,7 +3310,7 @@ button.close {
 .alert {
   padding: 10px 35px 10px 15px;
   margin-bottom: 20px;
-  color: #c09853;
+  color: #872929;
   background-color: #fcf8e3;
   border: 1px solid #fbeed5;
   border-radius: 4px;
@@ -3344,9 +3344,9 @@ button.close {
   color: #356635;
 }
 .alert-danger {
-  background-color: #f2dede;
+  background-color: #fcebeb;
   border-color: #eed3d7;
-  color: #b94a48;
+  color: #6c2322;
 }
 .alert-danger hr {
   border-top-color: #e6c1c7;
@@ -3355,9 +3355,9 @@ button.close {
   color: #953b39;
 }
 .alert-info {
-  background-color: #d9edf7;
+  background-color: #fff7e6;
   border-color: #bce8f1;
-  color: #3a87ad;
+  color: #2a6785;
 }
 .alert-info hr {
   border-top-color: #a6e1ec;
@@ -3445,7 +3445,7 @@ a.thumbnail:focus {
   text-align: center;
   white-space: nowrap;
   vertical-align: baseline;
-  background-color: #999999;
+  background-color: #6f6f6f;
   border-radius: .25em;
 }
 .label[href]:hover,
@@ -3494,7 +3494,7 @@ a.thumbnail:focus {
   vertical-align: baseline;
   white-space: nowrap;
   text-align: center;
-  background-color: #999999;
+  background-color: #6d6d6d;
   border-radius: 10px;
 }
 .badge:empty {

package/static/assets/images/flags/au.svg

@@ -0,0 +1,18 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10080 5040" width="10080" height="5040">
+<title>Australia</title>
+<defs><clipPath id="s"><path d="M0,0 v30 h60 v-30 z"/></clipPath><clipPath id="t"><path d="M30,15 h30 v15 z v15 h-30 z h-30 v-15 z v-15 h30 z"/></clipPath></defs>
+<rect width="10080" height="5040" fill="#012169"/>
+<svg width="5040" height="2520" viewBox="0 0 60 30"><g clip-path="url(#s)">
+<path d="M0,0 L60,30 M60,0 L0,30" stroke="#fff" stroke-width="6"/>
+<path d="M0,0 L60,30 M60,0 L0,30" clip-path="url(#t)" stroke="#C8102E" stroke-width="4"/>
+<path d="M30,0 v30 M0,15 h60" stroke="#fff" stroke-width="10"/>
+<path d="M30,0 v30 M0,15 h60" stroke="#C8102E" stroke-width="6"/>
+</g></svg>
+<g fill="#fff">
+<polygon points="2520.0,2700.0 2728.3,3347.5 3364.4,3106.6 2988.0,3673.2 3572.9,4020.3 2895.3,4079.3 2988.6,4753.0 2520.0,4260.0 2051.4,4753.0 2144.7,4079.3 1467.1,4020.3 2052.0,3673.2 1675.6,3106.6 2311.7,3347.5"/>
+<polygon points="7560.0,3720.0 7652.6,4007.8 7935.3,3900.7 7768.0,4152.5 8028.0,4306.8 7726.8,4333.0 7768.3,4632.5 7560.0,4413.3 7351.7,4632.5 7393.2,4333.0 7092.0,4306.8 7352.0,4152.5 7184.7,3900.7 7467.4,4007.8"/>
+<polygon points="6300.0,1725.0 6392.6,2012.8 6675.3,1905.7 6508.0,2157.5 6768.0,2311.8 6466.8,2338.0 6508.3,2637.5 6300.0,2418.3 6091.7,2637.5 6133.2,2338.0 5832.0,2311.8 6092.0,2157.5 5924.7,1905.7 6207.4,2012.8"/>
+<polygon points="7560.0,360.0 7652.6,647.8 7935.3,540.7 7768.0,792.5 8028.0,946.8 7726.8,973.0 7768.3,1272.5 7560.0,1053.3 7351.7,1272.5 7393.2,973.0 7092.0,946.8 7352.0,792.5 7184.7,540.7 7467.4,647.8"/>
+<polygon points="8680.0,1389.0 8772.6,1676.8 9055.3,1569.7 8888.0,1821.5 9148.0,1975.8 8846.8,2002.0 8888.3,2301.5 8680.0,2082.3 8471.7,2301.5 8513.2,2002.0 8212.0,1975.8 8472.0,1821.5 8304.7,1569.7 8587.4,1676.8"/>
+<polygon points="8064.0,2450.0 8129.8,2639.4 8330.3,2643.5 8170.5,2764.6 8228.6,2956.5 8064.0,2842.0 7899.4,2956.5 7957.5,2764.6 7797.7,2643.5 7998.2,2639.4"/>
+</g></svg>

package/static/assets/images/flags/unknown.svg

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" width="64" height="64">
+<title>Nationality unknown</title>
+<g fill="none" stroke="#000" stroke-width="2.5">
+<circle cx="32" cy="32" r="28"/>
+<ellipse cx="32" cy="32" rx="12" ry="28"/>
+<line x1="32" y1="4" x2="32" y2="60"/>
+<line x1="4" y1="32" x2="60" y2="32"/>
+<path d="M8.5 18 Q32 24 55.5 18"/>
+<path d="M8.5 46 Q32 40 55.5 46"/>
+</g>
+</svg>

package/static/assets/images/flags/us.svg

@@ -0,0 +1,63 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 247 130" width="247" height="130">
+<title>United States</title>
+<rect width="247" height="130" fill="#fff"/>
+<rect y="0.00" width="247" height="10.00" fill="#B22234"/>
+<rect y="20.00" width="247" height="10.00" fill="#B22234"/>
+<rect y="40.00" width="247" height="10.00" fill="#B22234"/>
+<rect y="60.00" width="247" height="10.00" fill="#B22234"/>
+<rect y="80.00" width="247" height="10.00" fill="#B22234"/>
+<rect y="100.00" width="247" height="10.00" fill="#B22234"/>
+<rect y="120.00" width="247" height="10.00" fill="#B22234"/>
+<rect width="98.80" height="70.00" fill="#3C3B6E"/>
+<g fill="#fff">
+<polygon points="8.2,2.8 9.2,5.7 12.2,5.7 9.8,7.5 10.7,10.4 8.2,8.6 5.8,10.4 6.7,7.5 4.2,5.7 7.3,5.7"/>
+<polygon points="24.7,2.8 25.6,5.7 28.7,5.7 26.2,7.5 27.2,10.4 24.7,8.6 22.2,10.4 23.2,7.5 20.7,5.7 23.8,5.7"/>
+<polygon points="41.2,2.8 42.1,5.7 45.2,5.7 42.7,7.5 43.6,10.4 41.2,8.6 38.7,10.4 39.6,7.5 37.2,5.7 40.2,5.7"/>
+<polygon points="57.6,2.8 58.6,5.7 61.6,5.7 59.2,7.5 60.1,10.4 57.6,8.6 55.2,10.4 56.1,7.5 53.6,5.7 56.7,5.7"/>
+<polygon points="74.1,2.8 75.0,5.7 78.1,5.7 75.6,7.5 76.6,10.4 74.1,8.6 71.6,10.4 72.6,7.5 70.1,5.7 73.2,5.7"/>
+<polygon points="90.6,2.8 91.5,5.7 94.6,5.7 92.1,7.5 93.0,10.4 90.6,8.6 88.1,10.4 89.0,7.5 86.6,5.7 89.6,5.7"/>
+<polygon points="16.5,9.8 17.4,12.7 20.5,12.7 18.0,14.5 18.9,17.4 16.5,15.6 14.0,17.4 14.9,14.5 12.5,12.7 15.5,12.7"/>
+<polygon points="32.9,9.8 33.9,12.7 36.9,12.7 34.5,14.5 35.4,17.4 32.9,15.6 30.5,17.4 31.4,14.5 28.9,12.7 32.0,12.7"/>
+<polygon points="49.4,9.8 50.3,12.7 53.4,12.7 50.9,14.5 51.9,17.4 49.4,15.6 46.9,17.4 47.9,14.5 45.4,12.7 48.5,12.7"/>
+<polygon points="65.9,9.8 66.8,12.7 69.9,12.7 67.4,14.5 68.3,17.4 65.9,15.6 63.4,17.4 64.3,14.5 61.9,12.7 64.9,12.7"/>
+<polygon points="82.3,9.8 83.3,12.7 86.3,12.7 83.9,14.5 84.8,17.4 82.3,15.6 79.9,17.4 80.8,14.5 78.3,12.7 81.4,12.7"/>
+<polygon points="8.2,16.8 9.2,19.7 12.2,19.7 9.8,21.5 10.7,24.4 8.2,22.6 5.8,24.4 6.7,21.5 4.2,19.7 7.3,19.7"/>
+<polygon points="24.7,16.8 25.6,19.7 28.7,19.7 26.2,21.5 27.2,24.4 24.7,22.6 22.2,24.4 23.2,21.5 20.7,19.7 23.8,19.7"/>
+<polygon points="41.2,16.8 42.1,19.7 45.2,19.7 42.7,21.5 43.6,24.4 41.2,22.6 38.7,24.4 39.6,21.5 37.2,19.7 40.2,19.7"/>
+<polygon points="57.6,16.8 58.6,19.7 61.6,19.7 59.2,21.5 60.1,24.4 57.6,22.6 55.2,24.4 56.1,21.5 53.6,19.7 56.7,19.7"/>
+<polygon points="74.1,16.8 75.0,19.7 78.1,19.7 75.6,21.5 76.6,24.4 74.1,22.6 71.6,24.4 72.6,21.5 70.1,19.7 73.2,19.7"/>
+<polygon points="90.6,16.8 91.5,19.7 94.6,19.7 92.1,21.5 93.0,24.4 90.6,22.6 88.1,24.4 89.0,21.5 86.6,19.7 89.6,19.7"/>
+<polygon points="16.5,23.8 17.4,26.7 20.5,26.7 18.0,28.5 18.9,31.4 16.5,29.6 14.0,31.4 14.9,28.5 12.5,26.7 15.5,26.7"/>
+<polygon points="32.9,23.8 33.9,26.7 36.9,26.7 34.5,28.5 35.4,31.4 32.9,29.6 30.5,31.4 31.4,28.5 28.9,26.7 32.0,26.7"/>
+<polygon points="49.4,23.8 50.3,26.7 53.4,26.7 50.9,28.5 51.9,31.4 49.4,29.6 46.9,31.4 47.9,28.5 45.4,26.7 48.5,26.7"/>
+<polygon points="65.9,23.8 66.8,26.7 69.9,26.7 67.4,28.5 68.3,31.4 65.9,29.6 63.4,31.4 64.3,28.5 61.9,26.7 64.9,26.7"/>
+<polygon points="82.3,23.8 83.3,26.7 86.3,26.7 83.9,28.5 84.8,31.4 82.3,29.6 79.9,31.4 80.8,28.5 78.3,26.7 81.4,26.7"/>
+<polygon points="8.2,30.8 9.2,33.7 12.2,33.7 9.8,35.5 10.7,38.4 8.2,36.6 5.8,38.4 6.7,35.5 4.2,33.7 7.3,33.7"/>
+<polygon points="24.7,30.8 25.6,33.7 28.7,33.7 26.2,35.5 27.2,38.4 24.7,36.6 22.2,38.4 23.2,35.5 20.7,33.7 23.8,33.7"/>
+<polygon points="41.2,30.8 42.1,33.7 45.2,33.7 42.7,35.5 43.6,38.4 41.2,36.6 38.7,38.4 39.6,35.5 37.2,33.7 40.2,33.7"/>
+<polygon points="57.6,30.8 58.6,33.7 61.6,33.7 59.2,35.5 60.1,38.4 57.6,36.6 55.2,38.4 56.1,35.5 53.6,33.7 56.7,33.7"/>
+<polygon points="74.1,30.8 75.0,33.7 78.1,33.7 75.6,35.5 76.6,38.4 74.1,36.6 71.6,38.4 72.6,35.5 70.1,33.7 73.2,33.7"/>
+<polygon points="90.6,30.8 91.5,33.7 94.6,33.7 92.1,35.5 93.0,38.4 90.6,36.6 88.1,38.4 89.0,35.5 86.6,33.7 89.6,33.7"/>
+<polygon points="16.5,37.8 17.4,40.7 20.5,40.7 18.0,42.5 18.9,45.4 16.5,43.6 14.0,45.4 14.9,42.5 12.5,40.7 15.5,40.7"/>
+<polygon points="32.9,37.8 33.9,40.7 36.9,40.7 34.5,42.5 35.4,45.4 32.9,43.6 30.5,45.4 31.4,42.5 28.9,40.7 32.0,40.7"/>
+<polygon points="49.4,37.8 50.3,40.7 53.4,40.7 50.9,42.5 51.9,45.4 49.4,43.6 46.9,45.4 47.9,42.5 45.4,40.7 48.5,40.7"/>
+<polygon points="65.9,37.8 66.8,40.7 69.9,40.7 67.4,42.5 68.3,45.4 65.9,43.6 63.4,45.4 64.3,42.5 61.9,40.7 64.9,40.7"/>
+<polygon points="82.3,37.8 83.3,40.7 86.3,40.7 83.9,42.5 84.8,45.4 82.3,43.6 79.9,45.4 80.8,42.5 78.3,40.7 81.4,40.7"/>
+<polygon points="8.2,44.8 9.2,47.7 12.2,47.7 9.8,49.5 10.7,52.4 8.2,50.6 5.8,52.4 6.7,49.5 4.2,47.7 7.3,47.7"/>
+<polygon points="24.7,44.8 25.6,47.7 28.7,47.7 26.2,49.5 27.2,52.4 24.7,50.6 22.2,52.4 23.2,49.5 20.7,47.7 23.8,47.7"/>
+<polygon points="41.2,44.8 42.1,47.7 45.2,47.7 42.7,49.5 43.6,52.4 41.2,50.6 38.7,52.4 39.6,49.5 37.2,47.7 40.2,47.7"/>
+<polygon points="57.6,44.8 58.6,47.7 61.6,47.7 59.2,49.5 60.1,52.4 57.6,50.6 55.2,52.4 56.1,49.5 53.6,47.7 56.7,47.7"/>
+<polygon points="74.1,44.8 75.0,47.7 78.1,47.7 75.6,49.5 76.6,52.4 74.1,50.6 71.6,52.4 72.6,49.5 70.1,47.7 73.2,47.7"/>
+<polygon points="90.6,44.8 91.5,47.7 94.6,47.7 92.1,49.5 93.0,52.4 90.6,50.6 88.1,52.4 89.0,49.5 86.6,47.7 89.6,47.7"/>
+<polygon points="16.5,51.8 17.4,54.7 20.5,54.7 18.0,56.5 18.9,59.4 16.5,57.6 14.0,59.4 14.9,56.5 12.5,54.7 15.5,54.7"/>
+<polygon points="32.9,51.8 33.9,54.7 36.9,54.7 34.5,56.5 35.4,59.4 32.9,57.6 30.5,59.4 31.4,56.5 28.9,54.7 32.0,54.7"/>
+<polygon points="49.4,51.8 50.3,54.7 53.4,54.7 50.9,56.5 51.9,59.4 49.4,57.6 46.9,59.4 47.9,56.5 45.4,54.7 48.5,54.7"/>
+<polygon points="65.9,51.8 66.8,54.7 69.9,54.7 67.4,56.5 68.3,59.4 65.9,57.6 63.4,59.4 64.3,56.5 61.9,54.7 64.9,54.7"/>
+<polygon points="82.3,51.8 83.3,54.7 86.3,54.7 83.9,56.5 84.8,59.4 82.3,57.6 79.9,59.4 80.8,56.5 78.3,54.7 81.4,54.7"/>
+<polygon points="8.2,58.8 9.2,61.7 12.2,61.7 9.8,63.5 10.7,66.4 8.2,64.6 5.8,66.4 6.7,63.5 4.2,61.7 7.3,61.7"/>
+<polygon points="24.7,58.8 25.6,61.7 28.7,61.7 26.2,63.5 27.2,66.4 24.7,64.6 22.2,66.4 23.2,63.5 20.7,61.7 23.8,61.7"/>
+<polygon points="41.2,58.8 42.1,61.7 45.2,61.7 42.7,63.5 43.6,66.4 41.2,64.6 38.7,66.4 39.6,63.5 37.2,61.7 40.2,61.7"/>
+<polygon points="57.6,58.8 58.6,61.7 61.6,61.7 59.2,63.5 60.1,66.4 57.6,64.6 55.2,66.4 56.1,63.5 53.6,61.7 56.7,61.7"/>
+<polygon points="74.1,58.8 75.0,61.7 78.1,61.7 75.6,63.5 76.6,66.4 74.1,64.6 71.6,66.4 72.6,63.5 70.1,61.7 73.2,61.7"/>
+<polygon points="90.6,58.8 91.5,61.7 94.6,61.7 92.1,63.5 93.0,66.4 90.6,64.6 88.1,66.4 89.0,63.5 86.6,61.7 89.6,61.7"/>
+</g></svg>

package/stats-db.js

@@ -93,6 +93,29 @@ class StatsDatabase {
     }
     this.touchRunStatement = this.db.prepare(`UPDATE server_runs SET last_seen = ? WHERE id = ?`);
 
+    // Under the launcher (cluster.js): what it saw - processes exiting, being recycled and
+    // coming back, and what it answered itself. See library/cluster-events.js
+    this.db.exec(`
+      CREATE TABLE IF NOT EXISTS cluster_events (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        time INTEGER NOT NULL,
+        kind TEXT NOT NULL,
+        process TEXT,
+        detail TEXT,
+        count INTEGER NOT NULL,
+        ms INTEGER NOT NULL
+      )
+    `);
+    this.db.exec(`CREATE INDEX IF NOT EXISTS idx_cluster_events_time ON cluster_events(time)`);
+    this.insertClusterEvent = this.db.prepare(`
+      INSERT INTO cluster_events (time, kind, process, detail, count, ms) VALUES (?, ?, ?, ?, ?, ?)
+    `);
+    this.insertClusterEvents = this.db.transaction((rows) => {
+      for (const row of rows) {
+        this.insertClusterEvent.run(row.time, row.kind, row.process, row.detail, row.count, row.ms);
+      }
+    });
+
     this.insertStatement = this.db.prepare(`
       INSERT INTO request_counts
         (time, interval_ms, module, endpoint, operation, count_delta, count_total, time_delta, time_total)
@@ -199,6 +222,28 @@ class StatsDatabase {
     `).all(module, since, now);
   }
 
+  /**
+   * Record what the launcher saw (rows as library/cluster-events.js validRow gives them).
+   */
+  writeClusterEvents(rows) {
+    if (this.db && rows && rows.length > 0) {
+      this.insertClusterEvents(rows);
+    }
+  }
+
+  /**
+   * What the launcher saw in (since, now], oldest first: [{time, kind, process, detail, count, ms}].
+   */
+  clusterEventsSince(since, now) {
+    if (!this.db) {
+      return [];
+    }
+    return this.db.prepare(`
+      SELECT time, kind, process, detail, count, ms FROM cluster_events
+      WHERE time > ? AND time <= ? ORDER BY time, id
+    `).all(since, now);
+  }
+
   /**
    * Write one interval's worth of rows. All or nothing - if the transaction
    * fails the caller keeps its deltas and tries again next interval.

package/stats.js

@@ -2,6 +2,8 @@ const { monitorEventLoopDelay } = require('perf_hooks');
 const {Utilities} = require("./library/utilities");
 const escape = require('escape-html');
 const StatsDatabase = require('./stats-db');
+const { validRow: validClusterEvent } = require('./library/cluster-events');
+const { readProcessMemory } = require('./library/cgroup-memory');
 
 // Requests that aren't counted by a module (the root page, the dashboard) are
 // attributed here, and requests that have no endpoint dimension (everything
@@ -30,6 +32,10 @@ class ModuleStats {
     this.parent.countRequest(name, tat, this.module, endpoint);
   }
 
+  countExternalRequest(name, tat, endpoint = NO_ENDPOINT) {
+    this.parent.countExternalRequest(name, tat, this.module, endpoint);
+  }
+
   addTask(name, frequency) { this.parent.addTask(name, frequency); }
   task(name, state) { this.parent.task(name, state); }
   taskDone(name, state) { this.parent.taskDone(name, state); }
@@ -58,11 +64,22 @@ class ServerStats {
   started = false;
   requestCount = 0;
   staticRequestCount = 0;
+  // on the master under the launcher: the workers' requests added by mergeCounts
+  mergedRequestCount = 0;
   requestTime = 0;
-  // Collect metrics every 10 minutes
+  // requests that had to ask another server (see countExternalRequest): in requestCount, but
+  // not in requestTime, and sampled separately
+  externalCount = 0;
+  externalTime = 0;
+  externalCountSnapshot = 0;
+  // Collect metrics every 10 minutes (stats.sampleSeconds, else stats.intervalMinutes)
   intervalMs = 10 * 60 * 1000;
+  // and write the counters to the database every 10 minutes (stats.intervalMinutes)
+  flushMs = 10 * 60 * 1000;
   history = [];
   requestCountSnapshot = 0;
+  refusedCount = 0;
+  refusedCountSnapshot = 0;
   startMem = 0;
   startTime = Date.now();
   timer;
@@ -84,6 +101,12 @@ class ServerStats {
     this.log = log || console;
     if (this.config.intervalMinutes) {
       this.intervalMs = this.config.intervalMinutes * 60 * 1000;
+      this.flushMs = this.intervalMs;
+    }
+    // the graphs' sample interval, when it isn't the counters' (with a role, a minute at most:
+    // library/role.js)
+    if (this.config.sampleSeconds > 0) {
+      this.intervalMs = this.config.sampleSeconds * 1000;
     }
     this.openDatabase();
     this.timer = setInterval(() => {
@@ -129,11 +152,17 @@ class ServerStats {
       const currentMem = process.memoryUsage().heapUsed;
       const combinedCount = this.requestCount + this.staticRequestCount;
       const requestsDelta = combinedCount - this.requestCountSnapshot;
-      const requestsTat = requestsDelta > 0 ? this.requestTime / requestsDelta : 0;
-      const minutesSinceStart = this.history.length > 1
-        ? this.intervalMs / 60000
-        : (now - this.startTime) / 60000;
-      const requestsPerMin = minutesSinceStart > 0 ? requestsDelta / minutesSinceStart : 0;
+      // the external requests are timed separately: they are orders of magnitude slower
+      const externalDelta = this.externalCount - this.externalCountSnapshot;
+      const ownDelta = requestsDelta - externalDelta;
+      const requestsTat = ownDelta > 0 ? this.requestTime / ownDelta : 0;
+      // Under load, the timer can run late. Use the actual time since the last sample, so
+      // an event-loop stall does not inflate the displayed request rate.
+      const intervalMinutes = (now - (this.lastTime ?? this.startTime)) / 60000;
+      const requestsPerMin = intervalMinutes > 0 ? requestsDelta / intervalMinutes : 0;
+      // where this sample's interval began, so the cluster graphs can place a late sample
+      const intervalStart = this.lastTime ?? this.startTime;
+      const refused = this.refusedCount - this.refusedCountSnapshot;
 
       const loopDelay = this.eventLoopMonitor.mean / 1e6;
       // Worst single stall in the window - the mean dilutes a multi-second
@@ -146,11 +175,30 @@ class ServerStats {
       // shows its current size.)
       const clientConcepts = this._sumCachingModules('clientConceptCount');
 
-      this.history.push({time: now, mem: currentMem - this.startMem, rpm: requestsPerMin, tat: requestsTat, block: loopDelay, blockMax: loopMax, clientConcepts: clientConcepts});
+      const point = {time: now, mem: currentMem - this.startMem, rpm: requestsPerMin, tat: requestsTat, block: loopDelay, blockMax: loopMax, clientConcepts: clientConcepts};
+      // where the interval began, and this process's private memory (RssAnon: RSS less mapped
+      // files; null where /proc can't be read), for the graphs (library/cluster-metrics.js)
+      point.intervalStart = intervalStart;
+      // the external requests in the interval, and their mean turnaround (null: none)
+      point.ext = externalDelta;
+      point.extTat = externalDelta > 0 ? this.externalTime / externalDelta : null;
+      const own = readProcessMemory('self');
+      point.anon = own ? own.anon : null;
+      if (this.onMetric) {
+        // under the launcher: the memory guard's refusals, which only a role counts
+        point.refused = refused;
+      }
+      this.history.push(point);
+      if (this.onMetric) {
+        this.onMetric(point);
+      }
 
       this.eventLoopMonitor.reset();
       this.requestCountSnapshot = combinedCount;
+      this.refusedCountSnapshot = this.refusedCount;
       this.requestTime = 0;
+      this.externalCountSnapshot = this.externalCount;
+      this.externalTime = 0;
       this.lastTime = now;
 
       // Prune old data (keep 24 hours). Only the in-memory history is pruned -
@@ -158,7 +206,11 @@ class ServerStats {
       const cutoff = now - (24 * 60 * 60 * 1000); // 24 hours ago
       this.history = this.history.filter(m => m.time > cutoff);
 
-      this.flushCounters(now, this.intervalMs);
+      // the counters every flushMs: at each sample when the two intervals are the same, as
+      // before, else at the first sample after (half a sample's grace for a timer that fires early)
+      if (this.lastFlush === undefined || now - this.lastFlush >= this.flushMs - this.intervalMs / 2) {
+        this.flushCounters(now, this.flushMs);
+      }
     }
   }
 
@@ -291,6 +343,119 @@ class ServerStats {
     counter.timeTotal = counter.timeTotal + tat;
   }
 
+  /**
+   * Count one request whose answer had to ask another server (the tx module's ecosystem
+   * resolution: tx/ecosystem-resolver.js). These take seconds, not milliseconds, so they are
+   * kept out of the turnaround time graph and sampled separately (point.ext, point.extTat),
+   * and counted under their own operation, '<name> (external)'
+   */
+  countExternalRequest(name, tat, module = SERVER_MODULE, endpoint = NO_ENDPOINT) {
+    this.requestCount++;
+    this.externalCount++;
+    this.externalTime = this.externalTime + tat;
+
+    const counter = this.counterFor(module || SERVER_MODULE, endpoint || NO_ENDPOINT, (name || '(unnamed)') + ' (external)');
+    counter.countDelta++;
+    counter.countTotal++;
+    counter.timeDelta = counter.timeDelta + tat;
+    counter.timeTotal = counter.timeTotal + tat;
+  }
+
+  // The memory guard runs before routing and body parsing. Keep its refusals
+  // separate from completed module work and its turnaround-time denominator.
+  countRefusedRequest() {
+    this.refusedCount++;
+  }
+
+  /**
+   * For a tx-worker under the launcher (library/cluster-counts.js): the requests counted
+   * since the last call, [{module, endpoint, operation, count, time}], and start again
+   * from zero. A worker has no statistics database; the master merges these into its
+   * own counters (mergeCounts), so the master's database and daily report count every
+   * process, each request once.
+   */
+  takeCounts() {
+    const rows = [];
+    for (const counter of this.counters.values()) {
+      if (counter.countDelta > 0) {
+        rows.push({module: counter.module, endpoint: counter.endpoint, operation: counter.operation,
+          count: counter.countDelta, time: counter.timeDelta});
+        counter.countDelta = 0;
+        counter.timeDelta = 0;
+      }
+    }
+    return rows;
+  }
+
+  /** Put back what takeCounts gave, when it couldn't be sent: it goes with the next lot. */
+  restoreCounts(rows) {
+    for (const row of rows) {
+      const counter = this.counterFor(row.module, row.endpoint, row.operation);
+      counter.countDelta = counter.countDelta + row.count;
+      counter.timeDelta = counter.timeDelta + row.time;
+    }
+  }
+
+  /**
+   * On the master: add another process's requests (from its takeCounts) to the counters,
+   * as if this process had counted them. They are written out with the next interval and
+   * are in countsSince() at once. Rows that aren't well formed are ignored.
+   * @returns {number} the requests added
+   */
+  mergeCounts(rows) {
+    let added = 0;
+    for (const row of Array.isArray(rows) ? rows : []) {
+      if (!row || typeof row.module !== 'string' || typeof row.endpoint !== 'string' ||
+          typeof row.operation !== 'string' || !Number.isInteger(row.count) || row.count <= 0 ||
+          !Number.isFinite(row.time) || row.time < 0) {
+        continue;
+      }
+      const counter = this.counterFor(row.module, row.endpoint, row.operation);
+      counter.countDelta = counter.countDelta + row.count;
+      counter.countTotal = counter.countTotal + row.count;
+      counter.timeDelta = counter.timeDelta + row.time;
+      counter.timeTotal = counter.timeTotal + row.time;
+      added = added + row.count;
+    }
+    this.mergedRequestCount = this.mergedRequestCount + added;
+    return added;
+  }
+
+  /**
+   * On the master under the launcher: what the launcher saw (library/cluster-events.js),
+   * written straight to the database - there are few, and the daily report reads them from
+   * there. Rows that aren't well formed are ignored; without a database, all of them are.
+   * @returns {number} the rows written
+   */
+  recordClusterEvents(rows) {
+    if (!this.db) {
+      return 0;
+    }
+    const valid = (Array.isArray(rows) ? rows : []).map(validClusterEvent).filter(Boolean);
+    try {
+      this.db.writeClusterEvents(valid);
+      return valid.length;
+    } catch (e) {
+      this.log.error(`Unable to record the launcher's events: ${e.message}`);
+      return 0;
+    }
+  }
+
+  /**
+   * What the launcher saw in (since, now], oldest first, or null without a database.
+   */
+  clusterEventsSince(since, now = Date.now()) {
+    if (!this.db) {
+      return null;
+    }
+    try {
+      return this.db.clusterEventsSince(since, now);
+    } catch (e) {
+      this.log.error(`Unable to read the launcher's events: ${e.message}`);
+      return null;
+    }
+  }
+
   /**
    * Write out the counters that saw traffic this interval, and start the next
    * one. The deltas are only cleared if the write succeeded, so a transient
@@ -404,6 +569,28 @@ class ServerStats {
     }
   }
 
+  /**
+   * The background tasks for the status page: those at work, in full
+   * ([{name, state, frequency, date, ago}]); the names of those whose last run failed (the status
+   * line lists them, with their state); and the names of the rest (resting, or not run yet)
+   */
+  taskSummary(now = Date.now()) {
+    const working = [];
+    const failed = [];
+    const idle = [];
+    for (const [name, info] of this.taskMap) {
+      if (info.status === 'working') {
+        working.push({name: name, state: info.state, frequency: info.frequency, date: info.date,
+          ago: info.date ? Utilities.formatDuration(info.date, now) : ''});
+      } else if (info.status === 'error') {
+        failed.push(name);
+      } else {
+        idle.push(name);
+      }
+    }
+    return { working, failed, idle };
+  }
+
   /**
    * The background tasks whose last run failed: [{name, state, frequency, date}]
    */
@@ -449,7 +636,7 @@ class ServerStats {
     this.touchRun();
     // Synchronous, so the last partial interval is on disk before server.js
     // calls process.exit().
-    this.flushCounters(Date.now(), Date.now() - (this.lastTime || this.startTime));
+    this.flushCounters(Date.now(), Date.now() - (this.lastFlush || this.lastTime || this.startTime));
     if (this.db) {
       try {
         this.db.close();
@@ -503,4 +690,4 @@ class ServerStats {
 }
 module.exports = ServerStats;
 module.exports.ModuleStats = ModuleStats;
-module.exports.SERVER_MODULE = SERVER_MODULE;
+module.exports.SERVER_MODULE = SERVER_MODULE;

package/testing/testing-template.html

@@ -55,8 +55,6 @@
 		<div class="container">  <!-- container -->
 		<div style="background-color: #ad1f2f; padding: 6px; color: white;">  <!-- container -->
 
-  <a href="http://www.hl7.org/fhir" style="color: gold" title="Fast Healthcare Interoperability Resources - Home Page"><img border="0" src="/icon-fhir-16.png" style="vertical-align: text-bottom"/> <b>FHIR</b></a> &copy; HL7.org &nbsp;|&nbsp;
-  <a href="https://github.com/HealthIntersections/FHIRsmith/blob/main/README.md" style="color: gold"><img border="0" src="/FHIRsmith16.png" style="vertical-align: text-bottom"/> FHIRsmith</a> [%ver%] &nbsp;|&nbsp;
   <a href="/" style="color: gold"> Server Home</a> &nbsp;|&nbsp;
   <a href="/testing" style="color: gold">Test Reports</a>  &nbsp;|&nbsp;
   <a href="/testing/summary" style="color: gold">Summary</a>  &nbsp;|&nbsp;
@@ -73,7 +71,7 @@
             	<div class="inner-wrapper">
  <div class="col-12">
 
-  <h2><img border="0" src="/FHIRsmith32.png" style="vertical-align: text-bottom"/> [%title%] </h2>
+     <h2><a href="https://github.com/HealthIntersections/FHIRsmith/blob/main/README.md" title="FHIRsmith [%ver%]"><img border="0" src="/FHIRsmith32.png" alt="FHIRsmith Logo" style="vertical-align: text-bottom"/></a> [%title%] </h2>
 
 [%content%]
 
@@ -91,8 +89,7 @@
 		<div class="container">  <!-- container -->
 			<div class="inner-wrapper">
 				<p>
-                    <a href="http://www.hl7.org/fhir" style="color: gold" title="Fast Healthcare Interoperability Resources - Home Page"><img border="0" src="/icon-fhir-16.png" style="vertical-align: text-bottom"/> <b>FHIR</b></a> &copy; HL7.org 2011+.  &nbsp;|&nbsp;
-                    <a href="https://github.com/HealthIntersections/FHIRsmith/blob/main/README.md" style="color: gold"><img border="0" src="/FHIRsmith16.png" style="vertical-align: text-bottom"/> FHIRsmith</a>  [%ver%]  &copy; HealthIntersections.com.au 2023+ &nbsp;|&nbsp;
+                    <a href="https://github.com/HealthIntersections/FHIRsmith/blob/main/README.md" style="color: gold"><img border="0" src="/FHIRsmith16.png" alt="FHIRsmith Logo" style="vertical-align: text-bottom"/> FHIRsmith</a>  [%ver%]  &copy; HealthIntersections.com.au 2023+ &nbsp;|&nbsp;
                     &nbsp; ([%ms%] ms)
                     [%sponsorMessage%]
         </p>
@@ -115,10 +112,10 @@
 ================================================== -->
   <!-- Placed at the end of the document so the pages load faster -->
 <!-- <script src="/assets/js/jquery.js"/> -->
-<script src="/assets/js/bootstrap.min.js"/>
-<script src="/assets/js/respond.min.js"/>
+<script src="/assets/js/bootstrap.min.js"></script>
+<script src="/assets/js/respond.min.js"></script>
 
-<script src="/assets/js/fhir.js"/>
+<script src="/assets/js/fhir.js"></script>
 
   <!-- Analytics Below
 ================================================== -->

package/token/nginx_passport_setup.md

@@ -48,7 +48,7 @@ initializeSession() {
     rolling: true,
     cookie: {
       // This is key - secure cookies when behind HTTPS proxy
-      secure: this.config.server?.httpsProxy || process.env.NODE_ENV === 'production',
+      secure: this.config.cookieSecure ?? 'auto', // Secure when the request came over https (req.secure)
       httpOnly: true,
       maxAge: 24 * 60 * 60 * 1000,
       sameSite: 'lax'

package/token/security_guide.md

@@ -17,7 +17,7 @@ This guide covers the security considerations and proper implementation of Passp
   saveUninitialized: false,    // Don't create sessions until something stored
   rolling: true,               // Reset expiration on each request
   cookie: {
-    secure: NODE_ENV === 'production', // HTTPS only in production
+    secure: this.config.cookieSecure ?? 'auto', // Secure when the request came over https (req.secure)
     httpOnly: true,            // Prevent XSS access to cookies
     maxAge: 24 * 60 * 60 * 1000, // 24 hour expiration
     sameSite: 'lax'           // CSRF protection