Merge pull request #13 from Outburn-IL/fix-socket-hangups

Fix socket hangups

Author: mechanik-daniel

package-lock.json

@@ -5,18 +5,29 @@ const { log, logError } = require('./logger');
 
 const BIN_DIR = path.join(__dirname, '../../bin');
 const JAR_PATH = path.join(BIN_DIR, 'validator.jar');
-const GITHUB_API_URL = "https://api.github.com/repos/hapifhir/org.hl7.fhir.validator-wrapper/releases/latest";
+// Outburn's fork of the Validator Wrapper, supports skipping preset loading
+const GITHUB_API_URL = "https://api.github.com/repos/Outburn-IL/org.hl7.fhir.validator-wrapper/releases/latest";
+// Fallback to the original HAPI FHIR Validator Wrapper
+const GITHUB_API_FALLBACK = "https://api.github.com/repos/hapifhir/org.hl7.fhir.validator-wrapper/releases/latest";
 
 /**
  * Fetches the latest FHIR Validator JAR URL from GitHub Releases.
  */
 async function getLatestValidatorJarUrl() {
+    let response;
+    try {
+        response = await axios.get(GITHUB_API_URL);
+    } catch (error) {
+        logError("❌ Failed to fetch Outburn's fork of the validator. Falling back to the original HAPI FHIR Validator Wrapper.");
+        response = await axios.get(GITHUB_API_FALLBACK);
+    }
+    
     try {
         log("🔎 Checking latest FHIR Validator release...");
-        const response = await axios.get(GITHUB_API_URL);
+        
         const assets = response.data.assets;
 
-        const jarAsset = assets.find(asset => asset.name.includes('validator_cli.jar'));
+        const jarAsset = assets.find(asset => asset.name.startsWith('validator') && asset.name.endsWith('.jar'));
         if (!jarAsset) {
             throw new Error("Validator CLI JAR not found in the latest release.");
         }

src/utils/file-utils.js

@@ -13,7 +13,9 @@ class FHIRValidator {
     constructor({ cliContext = {} }) {
         this.javaExecutable = getJavaExecutable();
         this.cliContext = cliContext;
-        if (this.cliContext?.txServer && this.cliContext.txServer === 'n/a') this.cliContext.txServer = null;
+        if (this.cliContext?.txServer && ['n/a', '', 'null', 'none', 'na'].includes(this.cliContext.txServer)) this.cliContext.txServer = null;
+        this.cliContext.igs = this.cliContext?.igs || [];
+        this.cliContext.sv = this.cliContext?.sv || '4.0.1';
         this.sessionId = null;
         this.keepAliveInterval = null;
     }
@@ -22,7 +24,7 @@ class FHIRValidator {
      * Checks if the Validator Server is available by making a direct HTTP request.
      * @returns {Promise<boolean>} - Resolves to true if the server is responsive, otherwise false.
      */
-    async _isPortInUse() {
+    async isValidatorServerUp() {
         const url = "http://localhost:3500/ig";
         const maxRetries = 10;
         let attempts = 0;
@@ -62,7 +64,7 @@ class FHIRValidator {
      * Starts the Validator Server if it's not already running.
      */
     async startValidator() {
-        const isRunning = await this._isPortInUse(3500);
+        const isRunning = await this.isValidatorServerUp();
 
         if (!isRunning) {
             log("🚀 Starting FHIR Validator Server...");
@@ -75,7 +77,12 @@ class FHIRValidator {
             ], {
                 detached: true,
                 stdio: ['ignore', 'pipe', 'pipe'], // Capture stdout & stderr
-                env: { ...process.env, ENVIRONMENT: "prod" }
+                env: { 
+                    ...process.env, 
+                    ENVIRONMENT: "prod",
+                    // DEFAULT_SV: this.cliContext.sv,
+                    LOAD_PRESETS: "false"
+                }
             });
 
             let serverReady = false;
@@ -113,7 +120,7 @@ class FHIRValidator {
                         // ✅ Our process successfully started
                         clearInterval(checkInterval);
                         resolve();
-                    } else if (await this._isPortInUse(3500) && !serverReady) {
+                    } else if (await this.isValidatorServerUp() && !serverReady) {
                         // ⚠️ Another process took the port, and we never got "serverReady"
                         log("⚠️ Another process successfully bound to the port before ours was ready. Switching to 'already running' mode and terminating this process.");
                         this.process.kill();

src/validator.js

@@ -132,13 +132,12 @@ const expectedResult2 = {
 (async () => {
     const validator1 = await createValidatorInstance({
         sv: "4.0.1",
-        igs: ["il.core.fhir.r4#0.16.2"],
-        locale: "en"
+        igs: ["il.core.fhir.r4#0.16.2"]
     });
 
     const validator2 = await createValidatorInstance({
         sv: "4.0.1",
-        locale: "en"
+        igs: []
     });
 
     const resource = {