fhir-validator-wrapper 1.2.0 → 1.2.2

package/fhir-validator.js

@@ -24,6 +24,15 @@ class FhirValidator {
 
     // Version tracking file sits alongside the JAR
     this.versionFilePath = validatorJarPath + '.version';
+    this.version = undefined;
+    this.lastStderr = '';
+  }
+
+  /**
+   * @returns what version the validator jar reports that it is
+   */
+  jarVersion() {
+    return this.version;
   }
 
   /**
@@ -369,6 +378,10 @@ class FhirValidator {
 
     this.process.on('exit', (code, signal) => {
       this.log('info', `Validator process exited with code ${code} and signal ${signal}`);
+    });
+
+    this.process.on('close', (code, signal) => {
+      this.log('info', `Validator process closed`);
       this.cleanup();
     });
 
@@ -379,6 +392,7 @@ class FhirValidator {
         // Remove ANSI escape sequences (color codes, etc.)
         const cleanLine = line.replace(/\u001b\[[0-9;]*m/g, '').trim();
         if (cleanLine.length > 1) {
+          this.checkForVersion(cleanLine);
           this.log('info', `Validator: ${cleanLine}`);
         }
       });
@@ -388,8 +402,26 @@ class FhirValidator {
       this.log('error', `Validator-err: ${data}`);
     });
 
+    this.lastStderr = '';
+
+    this.process.stderr.on('data', (data) => {
+      const text = data.toString();
+      this.lastStderr += text;
+      this.log('error', `Validator-err: ${text}`);
+    });
+
     // Wait for the service to be ready
-    await this.waitForReady(timeout);
+    await Promise.race([
+      this.waitForReady(timeout),
+      new Promise((_, reject) => {
+        this.process.on('close', (code) => {
+          if (code !== 0) {
+            reject(new Error(`Validator exited with code ${code}:\n${this.lastStderr.slice(-2000)}`));
+          }
+        });
+      })
+    ]);
+
     this.log('info', 'FHIR validator service is ready');
   }
 
@@ -805,6 +837,15 @@ class FhirValidator {
   isRunning() {
     return this.process !== null && this.isReady;
   }
+
+  checkForVersion(cleanLine) {
+    if (!this.version) {
+      if (cleanLine.startsWith('FHIR Validation tool Version')) {
+        let parts = cleanLine.split(' ');
+        this.version = parts[4];
+      }
+    }
+  }
 }
 
 module.exports = FhirValidator;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fhir-validator-wrapper",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Node.js wrapper for the HL7 FHIR Validator CLI",
   "main": "fhir-validator.js",
   "scripts": {

package/readme.md

@@ -538,4 +538,16 @@ validator.setLogger(logger);
 ## Support
 
 For issues with this wrapper, please file a GitHub issue.
-For FHIR validator issues, see the [official FHIR validator documentation](https://confluence.hl7.org/spaces/FHIR/pages/35718580/Using+the+FHIR+Validator).
+For FHIR validator issues, see the [official FHIR validator documentation](https://confluence.hl7.org/spaces/FHIR/pages/35718580/Using+the+FHIR+Validator).
+
+## Release Process
+
+Check that there's an entry in CHANGELOG.md, and then:
+
+```
+npm login
+npm version patch ## or minor
+git push && git push --tags
+
+```
+