diff --git a/built/app.js b/built/app.js index 380d995..e10b7b3 100644 --- a/built/app.js +++ b/built/app.js @@ -108,6 +108,7 @@ APP.action(async (args) => { fhirVersion: capabilityStatement.fhirVersion || null, requestParameters, responseHeaders, + logVersion: "2" } }); }); diff --git a/built/index.js b/built/index.js index 76c31b9..5e550d8 100644 --- a/built/index.js +++ b/built/index.js @@ -1,7 +1,11 @@ "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -14,13 +18,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? ( var __exportStar = (this && this.__exportStar) || function(m, exports) { for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p); }; -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); - __setModuleDefault(result, mod); - return result; -}; +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.Types = exports.Streams = exports.Reporters = void 0; __exportStar(require("./lib"), exports); diff --git a/built/lib/BulkDataClient.js b/built/lib/BulkDataClient.js index cee12e2..1167977 100644 --- a/built/lib/BulkDataClient.js +++ b/built/lib/BulkDataClient.js @@ -1,7 +1,11 @@ "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -11,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? ( }) : function(o, v) { o["default"] = v; }); -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); - __setModuleDefault(result, mod); - return result; -}; +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; @@ -55,6 +69,9 @@ const debug = (0, util_1.debuglog)("app-request"); * ``` */ class BulkDataClient extends events_1.EventEmitter { + get statusEndpoint() { + return this._statusEndpoint; + } /** * Nothing special is done here - just remember the options and create * AbortController instance @@ -86,9 +103,6 @@ class BulkDataClient extends events_1.EventEmitter { } }); } - get statusEndpoint() { - return this._statusEndpoint; - } /** * Abort any current asynchronous task. This may include: * - pending HTTP requests @@ -510,7 +524,7 @@ class BulkDataClient extends events_1.EventEmitter { .catch(e => { if (e instanceof errors_1.FileDownloadError) { this.emit("downloadError", { - body: null, + body: null, // Buffer code: e.code || null, fileUrl: e.fileUrl, message: String(e.message || "File download failed"), diff --git a/built/lib/PDF.js b/built/lib/PDF.js index 05f7dbf..46829eb 100644 --- a/built/lib/PDF.js +++ b/built/lib/PDF.js @@ -1,7 +1,11 @@ "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -11,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? ( }) : function(o, v) { o["default"] = v; }); -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); - __setModuleDefault(result, mod); - return result; -}; +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); const pdfJsLib = __importStar(require("pdfjs-dist/legacy/build/pdf.js")); class PDF { diff --git a/built/lib/index.js b/built/lib/index.js index 9910925..c274421 100644 --- a/built/lib/index.js +++ b/built/lib/index.js @@ -1,7 +1,11 @@ "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -11,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? ( }) : function(o, v) { o["default"] = v; }); -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); - __setModuleDefault(result, mod); - return result; -}; +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; diff --git a/built/lib/utils.js b/built/lib/utils.js index 85224d1..13070fd 100644 --- a/built/lib/utils.js +++ b/built/lib/utils.js @@ -3,7 +3,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.filterResponseHeaders = exports.createDecompressor = exports.exit = exports.ask = exports.generateProgress = exports.fhirInstant = exports.assert = exports.humanFileSize = exports.getAccessTokenExpiration = exports.print = exports.formatDuration = exports.wait = exports.detectTokenUrl = exports.getTokenEndpointFromCapabilityStatement = exports.getTokenEndpointFromWellKnownSmartConfig = exports.getCapabilityStatement = exports.getWellKnownSmartConfig = void 0; +exports.print = void 0; +exports.getWellKnownSmartConfig = getWellKnownSmartConfig; +exports.getCapabilityStatement = getCapabilityStatement; +exports.getTokenEndpointFromWellKnownSmartConfig = getTokenEndpointFromWellKnownSmartConfig; +exports.getTokenEndpointFromCapabilityStatement = getTokenEndpointFromCapabilityStatement; +exports.detectTokenUrl = detectTokenUrl; +exports.wait = wait; +exports.formatDuration = formatDuration; +exports.getAccessTokenExpiration = getAccessTokenExpiration; +exports.humanFileSize = humanFileSize; +exports.assert = assert; +exports.fhirInstant = fhirInstant; +exports.generateProgress = generateProgress; +exports.ask = ask; +exports.exit = exit; +exports.createDecompressor = createDecompressor; +exports.filterResponseHeaders = filterResponseHeaders; require("colors"); const jsonwebtoken_1 = __importDefault(require("jsonwebtoken")); const url_1 = require("url"); @@ -36,7 +52,6 @@ async function getWellKnownSmartConfig(baseUrl, noCache = false) { throw e; }); } -exports.getWellKnownSmartConfig = getWellKnownSmartConfig; /** * Given a `baseUrl` fetches the `CapabilityStatement`. Note that this request * is cached by default! @@ -56,12 +71,10 @@ async function getCapabilityStatement(baseUrl, noCache = false) { throw e; }); } -exports.getCapabilityStatement = getCapabilityStatement; async function getTokenEndpointFromWellKnownSmartConfig(baseUrl) { const { body } = await getWellKnownSmartConfig(baseUrl); return body.token_endpoint || ""; } -exports.getTokenEndpointFromWellKnownSmartConfig = getTokenEndpointFromWellKnownSmartConfig; async function getTokenEndpointFromCapabilityStatement(baseUrl) { const oauthUrisUrl = "http://fhir-registry.smarthealthit.org/StructureDefinition/oauth-uris"; const { body } = await getCapabilityStatement(baseUrl); @@ -79,7 +92,6 @@ async function getTokenEndpointFromCapabilityStatement(baseUrl) { return ""; } } -exports.getTokenEndpointFromCapabilityStatement = getTokenEndpointFromCapabilityStatement; /** * Given a FHIR server baseURL, looks up it's `.well-known/smart-configuration` * and/or it's `CapabilityStatement` (whichever arrives first) and resolves with @@ -100,7 +112,6 @@ async function detectTokenUrl(baseUrl) { return "none"; } } -exports.detectTokenUrl = detectTokenUrl; /** * Simple utility for waiting. Returns a promise that will resolve after the * given number of milliseconds. The timer can be aborted if an `AbortSignal` @@ -128,7 +139,6 @@ function wait(ms, signal) { } }); } -exports.wait = wait; function formatDuration(ms) { let out = []; let meta = [ @@ -156,7 +166,6 @@ function formatDuration(ms) { } return out.join(", "); } -exports.formatDuration = formatDuration; exports.print = (() => { let lastLinesLength = 0; const _print = (lines = "") => { @@ -199,7 +208,6 @@ function getAccessTokenExpiration(tokenResponse) { // Option 3 - if none of the above worked set this to 5 minutes after now return now + 300; } -exports.getAccessTokenExpiration = getAccessTokenExpiration; /** * Returns the byte size with units * @param fileSizeInBytes The size to format @@ -217,7 +225,6 @@ function humanFileSize(fileSizeInBytes = 0, useBits = false) { } return Math.max(fileSizeInBytes, 0).toFixed(1) + units[i]; } -exports.humanFileSize = humanFileSize; function assert(condition, error, ctor = Error) { if (!(condition)) { if (typeof error === "function") { @@ -228,7 +235,6 @@ function assert(condition, error, ctor = Error) { } } } -exports.assert = assert; function fhirInstant(input) { input = String(input || ""); if (input) { @@ -242,7 +248,6 @@ function fhirInstant(input) { } return ""; } -exports.fhirInstant = fhirInstant; /** * Generates a progress indicator * @param pct The percentage @@ -270,7 +275,6 @@ function generateProgress(pct = 0, length = 40) { } return `${spinner} ${pct}%`; } -exports.generateProgress = generateProgress; function ask(question) { return new Promise(resolve => { exports.print.commit(); @@ -280,7 +284,6 @@ function ask(question) { }); }); } -exports.ask = ask; function exit(arg, details) { if (!arg) { process.exit(); @@ -351,7 +354,6 @@ function exit(arg, details) { } process.exit(exitCode); } -exports.exit = exit; function createDecompressor(res) { switch (res.headers["content-encoding"]) { case "gzip": return zlib_1.default.createGunzip(); @@ -368,7 +370,6 @@ function createDecompressor(res) { }); } } -exports.createDecompressor = createDecompressor; /** * Filter a Headers object down to a selected series of headers * @param headers The object of headers to filter @@ -393,4 +394,3 @@ function filterResponseHeaders(headers, selectedHeaders) { return matchedHeaders; }, {}); } -exports.filterResponseHeaders = filterResponseHeaders; diff --git a/built/loggers/index.js b/built/loggers/index.js index 18eb5ea..1f062dc 100644 --- a/built/loggers/index.js +++ b/built/loggers/index.js @@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.createLogger = void 0; +exports.createLogger = createLogger; const winston_1 = require("winston"); const path_1 = require("path"); const crypto_1 = __importDefault(require("crypto")); @@ -31,4 +31,3 @@ function createLogger(options = {}) { }))) }); } -exports.createLogger = createLogger; diff --git a/built/reporters/cli.js b/built/reporters/cli.js index 16f832f..2265854 100644 --- a/built/reporters/cli.js +++ b/built/reporters/cli.js @@ -1,5 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = CLIReporter; const utils_1 = require("../lib/utils"); require("colors"); function CLIReporter(client) { @@ -103,4 +104,3 @@ function CLIReporter(client) { } }; } -exports.default = CLIReporter; diff --git a/built/reporters/text.js b/built/reporters/text.js index 809f548..5e15372 100644 --- a/built/reporters/text.js +++ b/built/reporters/text.js @@ -1,5 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = TextReporter; const utils_1 = require("../lib/utils"); function TextReporter(client) { let downloadedPct = 0; @@ -88,4 +89,3 @@ function TextReporter(client) { } }; } -exports.default = TextReporter; diff --git a/src/app.ts b/src/app.ts index 5877a29..bb0e153 100644 --- a/src/app.ts +++ b/src/app.ts @@ -128,6 +128,7 @@ APP.action(async (args: BulkDataClient.CLIOptions) => { fhirVersion : capabilityStatement.fhirVersion || null, requestParameters, responseHeaders, + logVersion: "2" } }) }) diff --git a/test/logging.test.ts b/test/logging.test.ts index eef65c9..051d5f0 100644 --- a/test/logging.test.ts +++ b/test/logging.test.ts @@ -57,7 +57,8 @@ describe('Logging', function () { "softwareReleaseDate": "01-02-03", "fhirVersion": 100, "requestParameters": {}, - "responseHeaders": {} + "responseHeaders": {}, + logVersion: '2' }) }) @@ -92,6 +93,7 @@ describe('Logging', function () { "fhirVersion": 100, "requestParameters": {}, "responseHeaders": {}, + logVersion: '2' }) }) @@ -115,7 +117,8 @@ describe('Logging', function () { "softwareReleaseDate": null, "fhirVersion": null, "requestParameters": {}, - "responseHeaders": {} + "responseHeaders": {}, + logVersion: '2' }) })