@mountainpass/addressr 2.0.3 → 2.0.4

package/lib/ci/build.js

@@ -35,7 +35,7 @@ console.log('starting...');
   const node = client.container().from('node:12.11.0');
 
   // mount cloned repository into Node image
-  const runner = client.container({
+  await client.container({
     id: node
   }).withMountedDirectory('/src', source).withWorkdir('/src').withExec(['npm', 'run', 'hello']);
 });

package/lib/ci/pipeline.js

@@ -28,10 +28,12 @@ actions:
 
 */
 
-const cacheDir = `${(0, _envPaths.default)('', {
+const cacheDirectory = `${(0, _envPaths.default)('', {
   suffix: ''
 }).cache}/dagger`;
-const binLocation = `${cacheDir}/dagger-0.3.9`;
+const binLocation = `${cacheDirectory}/dagger-0.3.9`;
+
+// eslint-disable-next-line security/detect-non-literal-fs-filename -- internal cache path
 if (!process.env._EXPERIMENTAL_DAGGER_CLI_BIN && _nodeFs.default.existsSync(binLocation)) {
   process.env._EXPERIMENTAL_DAGGER_CLI_BIN = binLocation;
   console.log(`using already downloaded '${binLocation}'`);
@@ -59,8 +61,6 @@ console.log('connecting...');
   // console.log("Hello from Dagger and Node " + version)
 
   await installed.withExec(['npm', 'run', 'genversion']).file('version.js').export('dagger-version.js');
-  console.log(stdout);
-  console.error(stderr);
 
   /*
     npm run genversion

package/lib/client/elasticsearch.js

@@ -75,7 +75,7 @@ async function initIndex(esClient, clear, synonyms) {
           tokenizer: {
             whitecomma: {
               type: 'pattern',
-              pattern: '[\\W,]+',
+              pattern: String.raw`[\W,]+`,
               lowercase: false
             }
           }
@@ -208,7 +208,7 @@ async function esConnect(esport = ELASTIC_PORT, eshost = ELASTIC_HOST, interval
             logger(`connecting elastic search client on ${eshost}:${esport}...`);
             await esClient.ping();
             logger(`...connected to ${eshost}:${esport}`);
-            global.esClient = esClient;
+            globalThis.esClient = esClient;
             return esClient;
           } catch (error_) {
             error(`An error occurred while trying to connect the elastic search client on ${eshost}:${esport}`, error_);

package/lib/controllers/Addresses.js

@@ -17,12 +17,12 @@ function getAddress(request, response) {
     if (addressResponse.statusCode) {
       response.setHeader('Content-Type', 'application/json');
       response.status(addressResponse.statusCode);
-      response.json(addressResponse.json);
-    } else {
-      response.setHeader('link', addressResponse.link.toString());
-      (0, _writer.writeJson)(response, addressResponse.json);
+      return response.json(addressResponse.json);
     }
-    return;
+    response.setHeader('link', addressResponse.link.toString());
+    return (0, _writer.writeJson)(response, addressResponse.json);
+  }).catch(function (error_) {
+    (0, _writer.writeJson)(response, error_.body || error_);
   });
 }
 function getAddresses(request, response) {
@@ -33,12 +33,12 @@ function getAddresses(request, response) {
     if (addressesResponse.statusCode) {
       response.setHeader('Content-Type', 'application/json');
       response.status(addressesResponse.statusCode);
-      response.json(addressesResponse.json);
-    } else {
-      response.setHeader('link', addressesResponse.link.toString());
-      response.setHeader('link-template', addressesResponse.linkTemplate.toString());
-      (0, _writer.writeJson)(response, addressesResponse.json);
+      return response.json(addressesResponse.json);
     }
-    return;
+    response.setHeader('link', addressesResponse.link.toString());
+    response.setHeader('link-template', addressesResponse.linkTemplate.toString());
+    return (0, _writer.writeJson)(response, addressesResponse.json);
+  }).catch(function (error_) {
+    (0, _writer.writeJson)(response, error_.body || error_);
   });
 }

package/lib/controllers/Default.js

@@ -10,12 +10,12 @@ var _writer = require("../utils/writer.js");
 
 // var logger = debug('api');
 
-function getApiRoot(request, res) {
+function getApiRoot(request, response_) {
   (0, _DefaultService.getApiRoot)().then(function (response) {
-    res.setHeader('link', response.link.toString());
-    res.setHeader('link-template', response.linkTemplate.toString());
-    (0, _writer.writeJson)(res, response.body);
+    response_.setHeader('link', response.link.toString());
+    response_.setHeader('link-template', response.linkTemplate.toString());
+    return (0, _writer.writeJson)(response_, response.body);
   }).catch(function (error) {
-    (0, _writer.writeJson)(res, error.body);
+    (0, _writer.writeJson)(response_, error.body);
   });
 }

package/lib/deploy/create-deployment-archive.js

@@ -62,12 +62,12 @@ function createPackageJson(context, filepath) {
       [name]: version
     }
   };
-  fs.writeFileSync(filepath, JSON.stringify(newPackageJson, null, 2));
+  fs.writeFileSync(filepath, JSON.stringify(newPackageJson, undefined, 2)); // eslint-disable-line security/detect-non-literal-fs-filename -- internal deployment path
 }
-async function createDeploymentArchive(deploymentDir) {
-  shell.mkdir('-p', deploymentDir);
-  createPackageJson(packageJson, `${deploymentDir}/package.json`);
+async function createDeploymentArchive(deploymentDirectory) {
+  shell.mkdir('-p', deploymentDirectory);
+  createPackageJson(packageJson, `${deploymentDirectory}/package.json`);
   const archiveName = packageJson.name.replace('@', '').replace('/', '-');
-  await zip(`${deploymentDir}/`, `${archiveName}-deployment-${packageJson.version}.zip`);
+  await zip(`${deploymentDirectory}/`, `${archiveName}-deployment-${packageJson.version}.zip`);
 }
 createDeploymentArchive('./deployment');

package/lib/eslint.config.js

@@ -37,24 +37,28 @@ var _default = exports.default = [{
     strict: 2,
     'prettier/prettier': 'error',
     'import-x/default': 0,
-    'unicorn/filename-case': ['warn', {
+    'unicorn/filename-case': ['error', {
       cases: {
         kebabCase: true,
         pascalCase: true
       }
     }],
-    'unicorn/prevent-abbreviations': 'warn',
-    'unicorn/no-null': 'warn',
-    'unicorn/no-process-exit': 'warn',
+    'unicorn/prevent-abbreviations': ['error', {
+      replacements: {
+        res: {
+          response: true
+        },
+        dir: {
+          directory: true
+        }
+      }
+    }],
+    // Blocked by ADR 005 (Babel/CJS — requires native ESM)
     'unicorn/prefer-module': 'off',
+    // waycharter ops.find()/ops.filter() are not Array.prototype — false positives
     'unicorn/no-array-callback-reference': 'off',
-    'unicorn/no-array-for-each': 'off',
-    'unicorn/prefer-spread': 'off',
+    // Blocked by ADR 005 (Babel/CJS — requires native ESM)
     'unicorn/prefer-top-level-await': 'off',
-    'unicorn/prefer-global-this': 'off',
-    'unicorn/require-module-specifiers': 'off',
-    'unicorn/prefer-string-raw': 'off',
-    'unicorn/no-anonymous-default-export': 'off',
     'promise/always-return': 'warn',
     'promise/catch-or-return': 'warn',
     'n/no-unsupported-features/es-syntax': 'off',
@@ -65,9 +69,16 @@ var _default = exports.default = [{
     'no-process-exit': 'warn',
     'no-useless-assignment': 'off',
     complexity: 'warn',
+    'max-lines-per-function': ['warn', {
+      max: 100,
+      skipBlankLines: true,
+      skipComments: true
+    }],
+    'max-depth': ['warn', 4],
+    'max-params': ['warn', 4],
     'n/hashbang': ['error', {
       convertPath: {
-        'bin/**/*.js': ['^bin/(.+?)\\.js$', 'lib/bin/$1.js']
+        'bin/**/*.js': [String.raw`^bin/(.+?)\.js$`, 'lib/bin/$1.js']
       }
     }]
   }
@@ -89,4 +100,24 @@ var _default = exports.default = [{
   rules: {
     'n/hashbang': 'off'
   }
+}, {
+  // Dagger CI runtime — modules resolved by Dagger SDK, not Node.js
+  files: ['ci/**'],
+  rules: {
+    'import-x/no-unresolved': 'off',
+    'n/no-missing-import': 'off'
+  }
+}, {
+  // k6 load testing runtime — modules resolved by k6, not Node.js
+  files: ['test/k6/**'],
+  rules: {
+    'import-x/no-unresolved': 'off',
+    'n/no-missing-import': 'off'
+  }
+}, {
+  // Deploy scripts — deps installed in deployment context, not dev
+  files: ['deploy/**'],
+  rules: {
+    'n/no-missing-require': 'off'
+  }
 }];

package/lib/loader.js

@@ -3,7 +3,7 @@
 var _debug = _interopRequireDefault(require("debug"));
 var _elasticsearch = require("./client/elasticsearch");
 var _addressService = require("./service/address-service");
-var _printVersion = require("./service/printVersion");
+var _printVersion = require("./service/print-version");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const logger = (0, _debug.default)('api');
 const error = (0, _debug.default)('error');
@@ -12,20 +12,20 @@ if (process.env.DEBUG == undefined) {
 }
 const start = process.hrtime();
 (0, _elasticsearch.esConnect)().then(() => {
-  logger('es client connected');
+  return logger('es client connected');
 }).then(() => {
   console.log('======================');
   console.log('Addressr - Data Loader');
   console.log('======================');
-  (0, _printVersion.printVersion)();
+  return (0, _printVersion.printVersion)();
 }).then(_addressService.loadGnaf).then(() => {
-  logger('data loaded');
+  return logger('data loaded');
 }).then(() => {
   const end = process.hrtime(start);
-  logger(`Execution time: ${end[0]}s ${end[1] / 1_000_000}ms`);
+  return logger(`Execution time: ${end[0]}s ${end[1] / 1_000_000}ms`);
 }).then(() => {
   logger(`Fin`);
-  process.exit();
+  process.exit(); // eslint-disable-line unicorn/no-process-exit, n/no-process-exit, no-process-exit -- CLI loader entry point
 }).catch(error_ => {
   error('error loading data', error_);
   throw error_;

package/lib/server.js

@@ -2,20 +2,20 @@
 
 var _debug = _interopRequireDefault(require("debug"));
 var _elasticsearch = require("./client/elasticsearch");
-var _printVersion = require("./service/printVersion");
+var _printVersion = require("./service/print-version");
 var _swagger = require("./swagger");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const logger = (0, _debug.default)('api');
-(0, _swagger.startServer)().then(() => {
+(0, _swagger.startServer)().then(async () => {
   logger('connecting es client');
-  const p1 = (0, _elasticsearch.esConnect)().then(esClient => {
-    global.esClient = esClient;
-    logger('es client connected');
-  });
-  p1.then(() => {
-    console.log('=====================');
-    console.log('Addressr - API Server');
-    console.log('=====================');
-    (0, _printVersion.printVersion)();
-  });
+  const esClient = await (0, _elasticsearch.esConnect)();
+  globalThis.esClient = esClient;
+  logger('es client connected');
+  console.log('=====================');
+  console.log('Addressr - API Server');
+  console.log('=====================');
+  (0, _printVersion.printVersion)();
+}).catch(error => {
+  console.error('Failed to start server:', error);
+  throw error;
 });

package/lib/service/DefaultService.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getApiRoot = getApiRoot;
 var _debug = _interopRequireDefault(require("debug"));
 var _httpLinkHeader = _interopRequireDefault(require("http-link-header"));
-var _setLinkOptions = require("./setLinkOptions");
+var _setLinkOptions = require("./set-link-options");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 var logger = (0, _debug.default)('api');
 
@@ -17,10 +17,11 @@ var logger = (0, _debug.default)('api');
  * returns Root
  **/
 async function getApiRoot() {
-  const paths = Object.keys(global.swaggerDoc.paths).filter(p => global.swaggerDoc.paths[p].get !== undefined && global.swaggerDoc.paths[p].get['x-root-rel'] !== undefined);
+  /* eslint-disable security/detect-object-injection -- iterating Object.keys() of swagger spec, not user input */
+  const paths = Object.keys(globalThis.swaggerDocument.paths).filter(p => globalThis.swaggerDocument.paths[p].get !== undefined && globalThis.swaggerDocument.paths[p].get['x-root-rel'] !== undefined);
   const link = new _httpLinkHeader.default();
   for (const p of paths) {
-    const op = global.swaggerDoc.paths[p].get;
+    const op = globalThis.swaggerDocument.paths[p].get;
     if (op.parameters && op.parameters.some(parameter => parameter.required === true)) {
       // skip
     } else {
@@ -45,10 +46,13 @@ async function getApiRoot() {
   });
   const linkTemplate = new _httpLinkHeader.default();
   for (const url of paths) {
-    const op = global.swaggerDoc.paths[url].get;
+    const op = globalThis.swaggerDocument.paths[url].get;
     logger(op);
     (0, _setLinkOptions.setLinkOptions)(op, url, linkTemplate);
   }
+
+  /* eslint-enable security/detect-object-injection */
+
   return {
     link: link,
     body: {},

package/lib/service/address-service.js

@@ -23,7 +23,7 @@ var _nodeStream = _interopRequireDefault(require("node:stream"));
 var _unzipStream = _interopRequireDefault(require("unzip-stream"));
 var _elasticsearch = require("../client/elasticsearch");
 var _streamDown = _interopRequireDefault(require("../utils/stream-down"));
-var _setLinkOptions = require("./setLinkOptions");
+var _setLinkOptions = require("./set-link-options");
 var _keyv = require("keyv");
 var _keyvFile = require("keyv-file");
 var _nodeCrypto = _interopRequireDefault(require("node:crypto"));
@@ -54,10 +54,10 @@ const ONE_DAY_MS = 1000 * ONE_DAY_S;
 const THIRTY_DAYS_MS = ONE_DAY_MS * 30;
 const ES_INDEX_NAME = process.env.ES_INDEX_NAME || 'addressr';
 async function dropIndex() {
-  await (0, _elasticsearch.dropIndex)(global.esClient);
+  await (0, _elasticsearch.dropIndex)(globalThis.esClient);
 }
 async function clearAddresses() {
-  await (0, _elasticsearch.initIndex)(global.esClient, true);
+  await (0, _elasticsearch.initIndex)(globalThis.esClient, true);
 }
 async function setAddresses(addr) {
   await clearAddresses();
@@ -458,7 +458,7 @@ function mapGeo(geoSite, context, geoDefault) {
       })
     };
   }) : [];
-  const def = geoDefault && !foundDefault ? geoDefault.map(geo => {
+  const defaults = geoDefault && !foundDefault ? geoDefault.map(geo => {
     return {
       default: true,
       ...(geo.GEOCODE_TYPE_CODE !== '' && {
@@ -475,7 +475,7 @@ function mapGeo(geoSite, context, geoDefault) {
       })
     };
   }) : [];
-  return sites.concat(def);
+  return [...sites, ...defaults];
 }
 function mapToSla(fla) {
   return fla.join(', ');
@@ -819,7 +819,7 @@ async function loadAddressDetails(file, expectedCount, context, {
 }
 async function searchForAddress(searchString, p, pageSize = PAGE_SIZE) {
   //  const searchString = '657 The Entrance Road'; //'2/25 TOTTERDE'; // 'UNT 2, BELCONNEN';
-  const searchResp = await global.esClient.search({
+  const searchResp = await globalThis.esClient.search({
     index: ES_INDEX_NAME,
     body: {
       from: (p - 1 || 0) * pageSize,
@@ -882,7 +882,7 @@ async function sendIndexRequest(indexingBody, initialBackoff = Number.parseInt(p
   // eslint-disable-next-line no-constant-condition
   for (let count = 0; true; count++) {
     try {
-      const resp = await global.esClient.bulk({
+      const resp = await globalThis.esClient.bulk({
         refresh,
         body: indexingBody,
         timeout: process.env.ADDRESSR_INDEX_TIMEOUT || '300s'
@@ -962,17 +962,17 @@ function buildSynonyms(context) {
 const {
   readdir
 } = require('node:fs').promises;
-async function getFiles(currentDir, baseDir) {
-  const dir = _nodePath.default.resolve(baseDir, currentDir);
-  logger(`reading ${dir} (${currentDir} in ${baseDir})`);
-  const dirents = await readdir(dir, {
+async function getFiles(currentDirectory, baseDirectory) {
+  const directory = _nodePath.default.resolve(baseDirectory, currentDirectory);
+  logger(`reading ${directory} (${currentDirectory} in ${baseDirectory})`);
+  const dirents = await readdir(directory, {
     withFileTypes: true
   });
   const files = await Promise.all(dirents.map(dirent => {
-    const res = `${currentDir}/${dirent.name}`;
-    return dirent.isDirectory() ? getFiles(res, baseDir) : res;
+    const result = `${currentDirectory}/${dirent.name}`;
+    return dirent.isDirectory() ? getFiles(result, baseDirectory) : result;
   }));
-  return Array.prototype.concat(...files);
+  return files.flat();
 }
 function countFileLines(filePath) {
   return new Promise((resolve, reject) => {
@@ -1028,7 +1028,7 @@ async function loadGnafData(directory, {
   await loadAuthFiles(files, directory, loadContext, filesCounts);
   // loadContext now contains all the auth files, so we can build the synonyms
   const synonyms = buildSynonyms(loadContext);
-  await (0, _elasticsearch.initIndex)(global.esClient, process.env.ES_CLEAR_INDEX || false, synonyms);
+  await (0, _elasticsearch.initIndex)(globalThis.esClient, process.env.ES_CLEAR_INDEX || false, synonyms);
   const addressDetailFiles = files.filter(f => f.match(/ADDRESS_DETAIL/) && f.match(/\/Standard\//));
   logger('addressDetailFiles', addressDetailFiles);
   for (const detailFile of addressDetailFiles) {
@@ -1306,14 +1306,14 @@ async function loadGnaf({
     if (contents.length === 0) {
       throw new Error(`Data dir '${unzipped}' is empty`);
     }
-    const gnafDir = await (0, _glob.glob)('**/G-NAF/', {
+    const gnafDirectory = await (0, _glob.glob)('**/G-NAF/', {
       cwd: unzipped
     });
-    console.log(gnafDir);
-    if (gnafDir.length === 0) {
+    console.log(gnafDirectory);
+    if (gnafDirectory.length === 0) {
       throw new Error(`Cannot find 'G-NAF' directory in Data dir '${unzipped}'`);
     }
-    mainDirectory = _nodePath.default.dirname(`${unzipped}/${gnafDir[0].slice(0, -1)}`);
+    mainDirectory = _nodePath.default.dirname(`${unzipped}/${gnafDirectory[0].slice(0, -1)}`);
   }
   logger('Main Data dir', mainDirectory);
   await loadGnafData(mainDirectory, {
@@ -1330,7 +1330,7 @@ async function loadGnaf({
  **/
 async function getAddress(addressId) {
   try {
-    const jsonX = await global.esClient.get({
+    const jsonX = await globalThis.esClient.get({
       index: ES_INDEX_NAME,
       id: `/addresses/${addressId}`
     });

package/lib/src/server2.js

@@ -2,20 +2,20 @@
 
 var _debug = _interopRequireDefault(require("debug"));
 var _elasticsearch = require("../client/elasticsearch");
-var _printVersion = require("../service/printVersion");
-var _waycharterServer = require("./waycharterServer");
+var _printVersion = require("../service/print-version");
+var _waycharterServer = require("./waycharter-server");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const logger = (0, _debug.default)('api');
-(0, _waycharterServer.startRest2Server)().then(() => {
+(0, _waycharterServer.startRest2Server)().then(async () => {
   logger('connecting es client');
-  const p1 = (0, _elasticsearch.esConnect)().then(esClient => {
-    global.esClient = esClient;
-    logger('es client connected');
-  });
-  p1.then(() => {
-    console.log('=======================');
-    console.log('Addressr - API Server 2');
-    console.log('=======================');
-    (0, _printVersion.printVersion)();
-  });
+  const esClient = await (0, _elasticsearch.esConnect)();
+  globalThis.esClient = esClient;
+  logger('es client connected');
+  console.log('=======================');
+  console.log('Addressr - API Server 2');
+  console.log('=======================');
+  (0, _printVersion.printVersion)();
+}).catch(error => {
+  console.error('Failed to start server:', error);
+  throw error;
 });

package/lib/swagger.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.startServer = startServer;
 exports.stopServer = stopServer;
-exports.swaggerDoc = void 0;
+exports.swaggerDocument = void 0;
 exports.swaggerInit = swaggerInit;
 var _debug = _interopRequireDefault(require("debug"));
 var _express = _interopRequireDefault(require("express"));
@@ -32,12 +32,12 @@ var options = {
 
 // The Swagger document (require it, build it programmatically, fetch it from a URL, ...)
 var spec = (0, _nodeFs.readFileSync)(_nodePath.default.join(__dirname, 'api/swagger.yaml'), 'utf8');
-var swaggerDoc = exports.swaggerDoc = (0, _jsYaml.load)(spec);
-global.swaggerDoc = swaggerDoc;
+var swaggerDocument = exports.swaggerDocument = (0, _jsYaml.load)(spec);
+globalThis.swaggerDocument = swaggerDocument;
 function swaggerInit() {
   // Initialize the Swagger middleware
   return new Promise(resolve => {
-    (0, _swaggerTools.initializeMiddleware)(swaggerDoc, function (middleware) {
+    (0, _swaggerTools.initializeMiddleware)(swaggerDocument, function (middleware) {
       // Interpret Swagger resources and attach metadata to request - must be first in swagger-tools middleware chain
       const metaData = middleware.swaggerMetadata();
       app.use(metaData);
@@ -55,7 +55,7 @@ function swaggerInit() {
         // apiDocs: '/api-docs',
         // swaggerUi: '/docs',
       }));
-      app.use(function (error_, request, res, next) {
+      app.use(function (error_, request, response, next) {
         if (error_.failedValidation) {
           // handle validation errror
           const rehydratedError = Object.assign({}, error_);
@@ -70,13 +70,13 @@ function swaggerInit() {
             delete rehydratedError.results;
           }
           error('error!!!', error_.message, JSON.stringify(rehydratedError, undefined, 2));
-          res.status(error_.code === 'SCHEMA_VALIDATION_FAILED' ? '500' : '400').json(rehydratedError);
+          response.status(error_.code === 'SCHEMA_VALIDATION_FAILED' ? '500' : '400').json(rehydratedError);
         } else {
           next();
         }
       });
-      global.swaggerApp = app;
-      global.swaggerMiddleware = middleware;
+      globalThis.swaggerApp = app;
+      globalThis.swaggerMiddleware = middleware;
       resolve({
         app,
         middleware

package/lib/utils/stream-down.js

@@ -2,21 +2,19 @@
 
 var _progress = _interopRequireDefault(require("progress"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const {
-  parse
-} = require('node:url');
 const http = require('node:https');
 const fs = require('node:fs');
 const pathUtil = require('node:path');
-module.exports = function (url, path, size) {
-  const uri = parse(url);
+module.exports = function streamDown(url, path, size) {
+  const uri = new URL(url);
   if (!path) {
-    path = pathUtil.basename(uri.path);
+    path = pathUtil.basename(uri.pathname);
   }
-  const file = fs.createWriteStream(path);
+  const file = fs.createWriteStream(path); // eslint-disable-line security/detect-non-literal-fs-filename -- path is internal
+
   return new Promise(function (resolve, reject) {
-    http.get(uri.href).on('response', function (res) {
-      const length = res.headers['content-length'] ? Number.parseInt(res.headers['content-length'], 10) : size;
+    http.get(uri.toString()).on('response', function (response) {
+      const length = response.headers['content-length'] ? Number.parseInt(response.headers['content-length'], 10) : size;
       //   let downloaded = 0;
       //   let percent = 0;
       var bar = new _progress.default('  downloading [:bar] :rate/bps :percent :etas', {
@@ -25,7 +23,7 @@ module.exports = function (url, path, size) {
         width: 20,
         total: length
       });
-      res.on('data', function (chunk) {
+      response.on('data', function (chunk) {
         file.write(chunk);
         //   downloaded += chunk.length;
         //percent = ((100.0 * downloaded) / len).toFixed(2);
@@ -39,8 +37,8 @@ module.exports = function (url, path, size) {
         //   );
       }).on('end', function () {
         file.end();
-        console.log(`\n${uri.path} downloaded to: ${path}`);
-        resolve(res);
+        console.log(`\n${uri.pathname} downloaded to: ${path}`);
+        resolve(response);
       }).on('error', function (error) {
         reject(error);
       });

package/lib/version.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = void 0;
 // Generated by genversion.
-const version = exports.version = '2.0.3';
+const version = exports.version = '2.0.4';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mountainpass/addressr",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Australian Address Validation, Search and Autocomplete",
   "author": {
     "name": "Mountain Pass",

package/scripts/check-version.js

@@ -7,5 +7,5 @@ if (!satisfies(process.version, version)) {
   console.log(
     `Required node version ${version} not satisfied with current version ${process.version}.`,
   );
-  process.exit(1);
+  process.exit(1); // eslint-disable-line no-process-exit, n/no-process-exit -- postinstall version check
 }