@mountainpass/addressr 2.0.2 → 2.0.4

package/README.md

@@ -1,79 +1,56 @@
 # Addressr
 
-![Addressr](https://addressr.io/icons/icon-144x144.png 'Addressr')
+![Addressr](https://addressr.io/icons/icon-144x144.png ‘Addressr’)
 
 [Australian Address Validation, Search and Autocomplete](https://addressr.io) - [addressr.io](https://addressr.io)
 
-[![GitHub license](https://img.shields.io/github/license/mountain-pass/addressr)](https://github.com/mountain-pass/addressr/blob/master/LICENSE) [![npm](https://img.shields.io/npm/v/@mountainpass/addressr)](https://www.npmjs.com/package/@mountainpass/addressr) [![npm downloads](https://img.shields.io/npm/dm/@mountainpass/addressr)](https://www.npmjs.com/package/@mountainpass/addressr) [![Docker Image Version (latest by date)](https://img.shields.io/docker/v/mountainpass/addressr?label=image%20version)](https://hub.docker.com/r/mountainpass/addressr) [![Docker Pulls](https://img.shields.io/docker/pulls/mountainpass/addressr)](https://hub.docker.com/r/mountainpass/addressr)
+[![GitHub license](https://img.shields.io/github/license/mountain-pass/addressr)](https://github.com/mountain-pass/addressr/blob/master/LICENSE) [![npm](https://img.shields.io/npm/v/@mountainpass/addressr)](https://www.npmjs.com/package/@mountainpass/addressr) [![npm downloads](https://img.shields.io/npm/dm/@mountainpass/addressr)](https://www.npmjs.com/package/@mountainpass/addressr)
 
-[![Addressr Build Status](https://circleci.com/gh/mountain-pass/addressr.svg?style=shield)](https://circleci.com/gh/mountain-pass/addressr) [![Maintainability](https://api.codeclimate.com/v1/badges/e5117809cacb7e32eb5c/maintainability)](https://codeclimate.com/github/mountain-pass/addressr/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/e5117809cacb7e32eb5c/test_coverage)](https://codeclimate.com/github/mountain-pass/addressr/test_coverage)
+[![Maintainability](https://api.codeclimate.com/v1/badges/e5117809cacb7e32eb5c/maintainability)](https://codeclimate.com/github/mountain-pass/addressr/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/e5117809cacb7e32eb5c/test_coverage)](https://codeclimate.com/github/mountain-pass/addressr/test_coverage) ![Uptime Robot ratio (30 days)](https://img.shields.io/uptimerobot/ratio/m788652244-3e35661f9886333310f4dc2f)
 
-[![GitHub issues](https://img.shields.io/github/issues/mountain-pass/addressr)](https://github.com/mountain-pass/addressr/issues) [![GitHub pull requests](https://img.shields.io/github/issues-pr/mountain-pass/addressr)](https://github.com/mountain-pass/addressr/pulls) [![Libraries.io dependency status for latest release](https://img.shields.io/librariesio/release/npm/@mountainpass/addressr)](https://libraries.io/npm/@mountainpass%2Faddressr) [![Join the chat at https://gitter.im/mountainpass-addressr/community](https://badges.gitter.im/mountainpass-addressr/community.svg)](https://gitter.im/mountainpass-addressr/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
-[![Gitter](https://badges.gitter.im/mountainpass-addressr/community.svg)](https://gitter.im/mountainpass-addressr/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-
-![Uptime Robot ratio (30 days)](https://img.shields.io/uptimerobot/ratio/m788652244-3e35661f9886333310f4dc2f?logo=data:image/png;base64,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)
+[![GitHub issues](https://img.shields.io/github/issues/mountain-pass/addressr)](https://github.com/mountain-pass/addressr/issues) [![GitHub pull requests](https://img.shields.io/github/issues-pr/mountain-pass/addressr)](https://github.com/mountain-pass/addressr/pulls)
 
 # About
 
-Australian Address Validation, Search and Autocomplete
-
-## Australian Data Source
-
-Addresses validated against the Geocoded National Address File (referred to as G-NAF), Australia’s **authoritative** address file.
-
-## Software As or **NOT** As A Service
-
-We love SaaS, but we know its not for everyone. SaaS or self hosted, we've got you covered.
-
-## Always Up-To-Date
-
-Addressr automatically updates with the latest data, so you're never out-of-date.
+Australian Address Validation, Search and Autocomplete powered by the Geocoded National Address File (G-NAF), Australia’s **authoritative** address database with 15+ million addresses.
 
-## Real-time Address Validation
-
-Add address autocomplete, search and validation to your forms.
-
-## Easy To Use API
+# Quick Start
 
-Build your solution quickly, with our straightforward API.
+## Use the Hosted API
 
-## Run On Your Own Infrastructure or Use Ours
+The fastest way to get started. No infrastructure to manage.
 
-On-premise or in the cloud, run Addressr on your own infrastructure, or leave all the hard work to us.
+1. Get an API key at [RapidAPI](https://rapidapi.com/addressr-addressr-default/api/addressr)
+2. Search for an address:
 
-## Completely Free or Pay for Support
+   ```sh
+   curl "https://addressr.p.rapidapi.com/addresses?q=1+george+st+sydney" \
+     -H "x-rapidapi-key: YOUR_KEY" \
+     -H "x-rapidapi-host: addressr.p.rapidapi.com"
+   ```
 
-That's right, Addressr is completely free **Forever**.
-Or for peace of mind for your mission critical solutions, get commercial support you can truly rely on.
+## Use with AI Assistants
 
-# ToC
+Connect Addressr to Claude, Cursor, VS Code Copilot, or any MCP-compatible AI assistant.
 
-- [Addressr](#addressr)
-- [About](#about)
-  - [Australian Data Source](#australian-data-source)
-  - [Software As or **NOT** As A Service](#software-as-or-not-as-a-service)
-  - [Always Up-To-Date](#always-up-to-date)
-  - [Real-time Address Validation](#real-time-address-validation)
-  - [Easy To Use API](#easy-to-use-api)
-  - [Run On Your Own Infrastructure or Use Ours](#run-on-your-own-infrastructure-or-use-ours)
-  - [Completely Free or Pay for Support](#completely-free-or-pay-for-support)
-- [ToC](#toc)
-- [Quick Start](#quick-start)
-  - [Self Hosted](#self-hosted)
-  - [How it Works](#how-it-works)
-  - [Additional Settings](#additional-settings)
-  - [System requirements](#system-requirements)
-    - [Open Search](#open-search)
-    - [Addressr Loader](#addressr-loader)
-      - [Default](#default)
-      - [With Geocoding enabled](#with-geocoding-enabled)
-    - [Addressr Server](#addressr-server)
+```json
+{
+  "mcpServers": {
+    "addressr": {
+      "command": "npx",
+      "args": ["-y", "@mountainpass/addressr-mcp"],
+      "env": { "RAPIDAPI_KEY": "your-key" }
+    }
+  }
+}
+```
 
-# Quick Start
+Three tools available: **search-addresses**, **get-address**, and **health**. See [@mountainpass/addressr-mcp](https://github.com/mountain-pass/addressr-mcp) for full setup instructions.
 
 ## Self Hosted
 
+Run Addressr on your own infrastructure for full control over your data.
+
 1. Install addressr
 
    ```
@@ -186,12 +163,12 @@ opensearch >= 1.2.4 with 1.4GiB of memory
 
 #### Default
 
-Node.js >= 12.11.0 with 1GiB of memory
+Node.js >= 22 with 1GiB of memory
 
 #### With Geocoding enabled
 
-Node.js >= 12.11.0 with 8GiB of memory
+Node.js >= 22 with 8GiB of memory
 
 ### Addressr Server
 
-Node.js >= 12.11.0 with 64MiB of memory
+Node.js >= 22 with 64MiB of memory

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,11 +17,12 @@ 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;
-    if (op.parameters && op.parameters.find(parameter => parameter.required === true)) {
+    const op = globalThis.swaggerDocument.paths[p].get;
+    if (op.parameters && op.parameters.some(parameter => parameter.required === true)) {
       // skip
     } else {
       link.set({
@@ -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,8 +23,8 @@ 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 _keyv = _interopRequireDefault(require("keyv"));
+var _setLinkOptions = require("./set-link-options");
+var _keyv = require("keyv");
 var _keyvFile = require("keyv-file");
 var _nodeCrypto = _interopRequireDefault(require("node:crypto"));
 var _glob = require("glob");
@@ -37,7 +37,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const fsp = _nodeFs.default.promises;
 var logger = (0, _debug.default)('api');
 var error = (0, _debug.default)('error');
-const cache = new _keyv.default({
+const cache = new _keyv.Keyv({
   store: new _keyvFile.KeyvFile({
     filename: 'target/keyv-file.msgpack'
   })
@@ -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,21 +962,21 @@ 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) => {
-    const readStream = _nodeFs.default.createReadStream(filePath, 'utf-8');
+    const readStream = _nodeFs.default.createReadStream(filePath, 'utf8');
     let lines = 0;
     let last;
     readStream.on('data', function (chunk) {
@@ -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) {
@@ -1113,10 +1113,6 @@ async function loadFileCounts(countsFile) {
   logger('filesCounts', filesCounts);
   return filesCounts;
 }
-async function loadFileContents(contentsFile) {
-  const contents = await fsp.readFile(contentsFile);
-  return contents.toString().split('\n').map(line => line.trim());
-}
 async function loadState(files, directory, state) {
   const stateFile = files.find(f => f.match(new RegExp(`${state}_STATE_psv`)));
   if (stateFile === undefined) {
@@ -1310,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, {
@@ -1334,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.2';
+const version = exports.version = '2.0.4';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mountainpass/addressr",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "Australian Address Validation, Search and Autocomplete",
   "author": {
     "name": "Mountain Pass",
@@ -106,6 +106,7 @@
     "test:cli2:geo": "ES_INDEX_NAME=test PORT=$npm_package_config_localport ADDRESSR_ENABLE_GEO=1 DEBUG=error,api,express:*,swagger-tools*,test,es run-p --race start:server2:preinstalled dotest:cli2:geo",
     "dotest:cli2:geo": "ADDRESSR_ENABLE_GEO=1 ES_INDEX_NAME=test COVERED_STATES=OT TEST_PROFILE=cli2 cucumber-js -p cli2 -- --harmony_async_iteration",
     "cover:cli:geo": "nyc --report-dir coverage/cli --temp-dir coverage/cli/.nyc_output npm run test:cli:nogeo",
+    "test:mcp:smoke": "node --test test/mcp/smoke.test.mjs",
     "test:nodejs:QLD:nogeo": "PORT=$npm_package_config_localport ES_INDEX_NAME=test COVERED_STATES=QLD DEBUG=error,api,express:*,swagger-tools*,test,es TEST_PROFILE=default cucumber-js -p default -- --harmony_async_iteration",
     "test:nodejs:QLD:geo": "PORT=$npm_package_config_localport ADDRESSR_ENABLE_GEO=1 ES_INDEX_NAME=test-geo COVERED_STATES=QLD DEBUG=error,api,express:*,swagger-tools*,test,es TEST_PROFILE=default NODE_OPTIONS=--max_old_space_size=8196 cucumber-js -p default -- --harmony_async_iteration",
     "prebuildX": "npm run genversion && cat ./templates/LICENSE.md | envsubst '${PRODUCT},${VERSION},${COMPANY},${YEAR}' > ./LICENSE.md",
@@ -170,9 +171,9 @@
     "glob": "^13.0.6",
     "http-link-header": "^1.1.3",
     "js-yaml": "^4.1.1",
-    "json-ptr": "2.1.0",
-    "keyv": "^4.0.1",
-    "keyv-file": "^0.2.0",
+    "json-ptr": "^3.1.1",
+    "keyv": "^5.6.0",
+    "keyv-file": "^5.3.3",
     "node-machine-id": "^1.1.12",
     "papaparse": "^5.0.0",
     "progress": "^2.0.3",
@@ -180,7 +181,7 @@
     "swagger-tools": "^0.10.4",
     "unzip-stream": "^0.3.0",
     "uri-template-lite": "^23.4.0",
-    "wait-port": "^0.2.2"
+    "wait-port": "^1.1.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.6.2",
@@ -195,10 +196,11 @@
     "@babel/register": "^7.7.0",
     "@babel/runtime": "^7.5.0",
     "@cucumber/cucumber": "^12.7.0",
+    "@modelcontextprotocol/sdk": "^1.29.0",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.7.1",
     "@eslint/js": "^9.39.4",
     "@istanbuljs/nyc-config-babel": "^3.0.0",
-    "@mountainpass/waychaser": "^5.0.44",
+    "@mountainpass/waychaser": "^5.0.50",
     "babel-plugin-istanbul": "^7.0.1",
     "bats": "^1.13.0",
     "chai": "^4.2.0",
@@ -211,7 +213,7 @@
     "eslint-plugin-prettier": "^5.5.5",
     "eslint-plugin-promise": "^7.2.1",
     "eslint-plugin-security": "^4.0.0",
-    "eslint-plugin-unicorn": "^63.0.0",
+    "eslint-plugin-unicorn": "^64.0.0",
     "genversion": "^3.0.0",
     "globals": "^17.4.0",
     "husky": "^9.1.7",
@@ -222,7 +224,7 @@
     "nodemon": "^3.1.14",
     "npm-check": "^6.0.1",
     "npm-run-all": "^4.1.5",
-    "nyc": "^15.1.0",
+    "nyc": "^18.0.0",
     "prettier": "^3.8.1",
     "prettier-config-standard": "^7.0.0",
     "turbo": "^2.8.17"

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
 }