@mountainpass/addressr 1.1.8 → 2.0.0

package/lib/service/address-service.js

@@ -3,55 +3,41 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.dropIndex = dropIndex;
 exports.clearAddresses = clearAddresses;
-exports.setAddresses = setAddresses;
+exports.dropIndex = dropIndex;
 exports.fetchGnafFile = fetchGnafFile;
-exports.unzipFile = unzipFile;
-exports.mapAddressDetails = mapAddressDetails;
-exports.searchForAddress = searchForAddress;
-exports.loadGnaf = loadGnaf;
 exports.getAddress = getAddress;
 exports.getAddresses = getAddresses;
-var _debug = require("debug");
-var _debug2 = _interopRequireDefault(_debug);
-var _directoryExists = require("directory-exists");
-var _directoryExists2 = _interopRequireDefault(_directoryExists);
-var _nodeFs = require("node:fs");
-var _nodeFs2 = _interopRequireDefault(_nodeFs);
-var _got = require("got");
-var _got2 = _interopRequireDefault(_got);
-var _httpLinkHeader = require("http-link-header");
-var _httpLinkHeader2 = _interopRequireDefault(_httpLinkHeader);
-var _papaparse = require("papaparse");
-var _papaparse2 = _interopRequireDefault(_papaparse);
-var _nodePath = require("node:path");
-var _nodePath2 = _interopRequireDefault(_nodePath);
-var _nodeStream = require("node:stream");
-var _nodeStream2 = _interopRequireDefault(_nodeStream);
-var _unzipStream = require("unzip-stream");
-var _unzipStream2 = _interopRequireDefault(_unzipStream);
+exports.loadGnaf = loadGnaf;
+exports.mapAddressDetails = mapAddressDetails;
+exports.searchForAddress = searchForAddress;
+exports.setAddresses = setAddresses;
+exports.unzipFile = unzipFile;
+var _debug = _interopRequireDefault(require("debug"));
+var _directoryExists = _interopRequireDefault(require("directory-exists"));
+var _nodeFs = _interopRequireDefault(require("node:fs"));
+var _httpLinkHeader = _interopRequireDefault(require("http-link-header"));
+var _papaparse = _interopRequireDefault(require("papaparse"));
+var _nodePath = _interopRequireDefault(require("node:path"));
+var _nodeStream = _interopRequireDefault(require("node:stream"));
+var _unzipStream = _interopRequireDefault(require("unzip-stream"));
 var _elasticsearch = require("../client/elasticsearch");
-var _streamDown = require("../utils/stream-down");
-var _streamDown2 = _interopRequireDefault(_streamDown);
+var _streamDown = _interopRequireDefault(require("../utils/stream-down"));
 var _setLinkOptions = require("./setLinkOptions");
-var _keyv = require("keyv");
-var _keyv2 = _interopRequireDefault(_keyv);
+var _keyv = _interopRequireDefault(require("keyv"));
 var _keyvFile = require("keyv-file");
-var _nodeCrypto = require("node:crypto");
-var _nodeCrypto2 = _interopRequireDefault(_nodeCrypto);
-var _globPromise = require("glob-promise");
-var _globPromise2 = _interopRequireDefault(_globPromise);
+var _nodeCrypto = _interopRequireDefault(require("node:crypto"));
+var _glob = require("glob");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-/* eslint-disable eslint-comments/disable-enable-pair */
+/* eslint-disable @eslint-community/eslint-comments/disable-enable-pair */
 /* eslint-disable security/detect-non-literal-regexp */
 /* eslint-disable security/detect-object-injection */
 /* eslint-disable security/detect-non-literal-fs-filename */
 
-const fsp = _nodeFs2.default.promises;
-var logger = (0, _debug2.default)('api');
-var error = (0, _debug2.default)('error');
-const cache = new _keyv2.default({
+const fsp = _nodeFs.default.promises;
+var logger = (0, _debug.default)('api');
+var error = (0, _debug.default)('error');
+const cache = new _keyv.default({
   store: new _keyvFile.KeyvFile({
     filename: 'target/keyv-file.msgpack'
   })
@@ -108,7 +94,7 @@ async function setAddresses(addr) {
 // need to try proxying this to modify the headers if we want to use got's cache implementation
 
 // SEE https://data.gov.au/data/dataset/19432f89-dc3a-4ef3-b943-5326ef1dbecc
-const GNAF_PACKAGE_URL = process.env.GNAF_PACKAGE_URL || 'https://data.gov.au/api/3/action/package_show?id=19432f89-dc3a-4ef3-b943-5326ef1dbecc';
+const GNAF_PACKAGE_URL = process.env.GNAF_PACKAGE_URL || 'https://data.gov.au/data/api/3/action/package_show?id=19432f89-dc3a-4ef3-b943-5326ef1dbecc';
 async function fetchPackageData() {
   const packageUrl = GNAF_PACKAGE_URL;
   // See if we have the value in cache
@@ -126,18 +112,22 @@ async function fetchPackageData() {
   }
   // cached value was older than one day, so go fetch
   try {
-    const response = await _got2.default.get(packageUrl);
-    logger('response.isFromCache', response.fromCache);
+    const fetchResponse = await fetch(packageUrl);
+    const body = await fetchResponse.text();
+    const headers = Object.fromEntries(fetchResponse.headers.entries());
     logger('fresh gnaf package data', {
-      body: response.body,
-      headers: response.headers
+      body,
+      headers
     });
     await cache.set(packageUrl, {
-      body: response.body,
-      headers: response.headers
+      body,
+      headers
     });
-    response.headers['x-cache'] = 'MISS';
-    return response;
+    headers['x-cache'] = 'MISS';
+    return {
+      body,
+      headers
+    };
   } catch (error_) {
     // we were unable to fetch. if we have cached value that isn't stale, return in
     if (cachedResponse !== undefined && age < THIRTY_DAYS_MS) {
@@ -159,12 +149,12 @@ async function fetchGnafFile() {
   logger('dataResource', JSON.stringify(dataResource, undefined, 2));
   logger('url', dataResource.url);
   logger('headers', JSON.stringify(response.headers, undefined, 2));
-  const basename = _nodePath2.default.basename(dataResource.url);
+  const basename = _nodePath.default.basename(dataResource.url);
   logger('basename', basename);
   const complete_path = GNAF_DIR;
   const incomplete_path = `${complete_path}/incomplete`;
   await new Promise((resolve, reject) => {
-    _nodeFs2.default.mkdir(incomplete_path, {
+    _nodeFs.default.mkdir(incomplete_path, {
       recursive: true
     }, error_ => {
       if (error_) reject(error_);else resolve();
@@ -172,7 +162,7 @@ async function fetchGnafFile() {
   });
   const destination = `${complete_path}/${basename}`;
   await new Promise((resolve, reject) => {
-    _nodeFs2.default.mkdir(incomplete_path, {
+    _nodeFs.default.mkdir(incomplete_path, {
       recursive: true
     }, error_ => {
       if (error_) reject(error_);else resolve();
@@ -181,7 +171,7 @@ async function fetchGnafFile() {
   // see if the file exists already
   try {
     await new Promise((resolve, reject) => {
-      _nodeFs2.default.access(destination, _nodeFs2.default.constants.R_OK, error_ => {
+      _nodeFs.default.access(destination, _nodeFs.default.constants.R_OK, error_ => {
         if (error_) reject(error_);else resolve();
       });
     });
@@ -191,7 +181,7 @@ async function fetchGnafFile() {
     // file doesn't exist, so we need to download it.
     logger('Starting G-NAF download');
     try {
-      await (0, _streamDown2.default)(dataResource.url, `${incomplete_path}/${basename}`, dataResource.size);
+      await (0, _streamDown.default)(dataResource.url, `${incomplete_path}/${basename}`, dataResource.size);
       await fsp.rename(`${incomplete_path}/${basename}`, destination);
       logger('Finished downloading G-NAF', destination);
       return destination;
@@ -202,32 +192,32 @@ async function fetchGnafFile() {
   }
 }
 async function unzipFile(file) {
-  const extname = _nodePath2.default.extname(file);
-  const basenameWithoutExtention = _nodePath2.default.basename(file, extname);
+  const extname = _nodePath.default.extname(file);
+  const basenameWithoutExtention = _nodePath.default.basename(file, extname);
   const incomplete_path = `${GNAF_DIR}/incomplete/${basenameWithoutExtention}`;
   const complete_path = `${GNAF_DIR}/${basenameWithoutExtention}`;
-  const exists = await (0, _directoryExists2.default)(complete_path);
+  const exists = await (0, _directoryExists.default)(complete_path);
   if (exists) {
     logger('directory exits. Skipping extract', complete_path);
     // already extracted. Move along.
     return complete_path;
   } else {
     await new Promise((resolve, reject) => {
-      _nodeFs2.default.mkdir(incomplete_path, {
+      _nodeFs.default.mkdir(incomplete_path, {
         recursive: true
       }, error_ => {
         if (error_) reject(error_);else resolve();
       });
     });
-    const readStream = _nodeFs2.default.createReadStream(file);
+    const readStream = _nodeFs.default.createReadStream(file);
     logger('before pipe');
     let prom = new Promise((resolve, reject) => {
-      readStream.pipe(_unzipStream2.default.Parse()).pipe(_nodeStream2.default.Transform({
+      readStream.pipe(_unzipStream.default.Parse()).pipe(_nodeStream.default.Transform({
         objectMode: true,
         transform: function (entry, encoding, callback) {
           const entryPath = `${incomplete_path}/${entry.path}`;
           if (entry.isDirectory) {
-            _nodeFs2.default.mkdir(entryPath, {
+            _nodeFs.default.mkdir(entryPath, {
               recursive: true
             }, error_ => {
               if (error_) {
@@ -239,15 +229,15 @@ async function unzipFile(file) {
               }
             });
           } else {
-            const dirname = _nodePath2.default.dirname(entryPath);
-            _nodeFs2.default.mkdir(dirname, {
+            const dirname = _nodePath.default.dirname(entryPath);
+            _nodeFs.default.mkdir(dirname, {
               recursive: true
             }, error_ => {
               if (error_) {
                 entry.autodrain();
                 callback(error_);
               } else {
-                _nodeFs2.default.stat(entryPath, (error_, stats) => {
+                _nodeFs.default.stat(entryPath, (error_, stats) => {
                   if (error_ && error_.code !== 'ENOENT') {
                     logger('error statting file', error_);
                     entry.autodrain();
@@ -262,7 +252,7 @@ async function unzipFile(file) {
                   } else {
                     // size is different, so extract the file
                     logger('extracting', entryPath);
-                    entry.pipe(_nodeFs2.default.createWriteStream(entryPath)).on('finish', () => {
+                    entry.pipe(_nodeFs.default.createWriteStream(entryPath)).on('finish', () => {
                       logger('finished extracting', entryPath);
                       callback();
                     }).on('error', error => {
@@ -285,7 +275,7 @@ async function unzipFile(file) {
     });
     await prom;
     return await new Promise((resolve, reject) => {
-      _nodeFs2.default.rename(incomplete_path, complete_path, error_ => {
+      _nodeFs.default.rename(incomplete_path, complete_path, error_ => {
         if (error_) reject(error_);else resolve(complete_path);
       });
     });
@@ -701,7 +691,7 @@ async function loadAddressDetails(file, expectedCount, context, {
 } = {}) {
   let actualCount = 0;
   await new Promise((resolve, reject) => {
-    _papaparse2.default.parse(_nodeFs2.default.createReadStream(file), {
+    _papaparse.default.parse(_nodeFs.default.createReadStream(file), {
       header: true,
       skipEmptyLines: true,
       chunkSize: Number.parseInt(process.env.ADDRESSR_LOADING_CHUNK_SIZE || '10') * 1024 * 1024,
@@ -924,7 +914,6 @@ async function sendIndexRequest(indexingBody, initialBackoff = Number.parseInt(p
       // parser.pause();
       // paused = true;
       await new Promise(resolve => {
-        // eslint-disable-next-line no-undef
         setTimeout(() => {
           resolve();
         }, backoff);
@@ -938,7 +927,7 @@ async function sendIndexRequest(indexingBody, initialBackoff = Number.parseInt(p
 }
 async function getStateName(abbr, file) {
   return await new Promise((resolve, reject) => {
-    _papaparse2.default.parse(_nodeFs2.default.createReadStream(file), {
+    _papaparse.default.parse(_nodeFs.default.createReadStream(file), {
       header: true,
       delimiter: '|',
       complete: results => {
@@ -974,7 +963,7 @@ const {
   readdir
 } = require('node:fs').promises;
 async function getFiles(currentDir, baseDir) {
-  const dir = _nodePath2.default.resolve(baseDir, currentDir);
+  const dir = _nodePath.default.resolve(baseDir, currentDir);
   logger(`reading ${dir} (${currentDir} in ${baseDir})`);
   const dirents = await readdir(dir, {
     withFileTypes: true
@@ -987,7 +976,7 @@ async function getFiles(currentDir, baseDir) {
 }
 function countFileLines(filePath) {
   return new Promise((resolve, reject) => {
-    const readStream = _nodeFs2.default.createReadStream(filePath, 'utf-8');
+    const readStream = _nodeFs.default.createReadStream(filePath, 'utf-8');
     let lines = 0;
     let last;
     readStream.on('data', function (chunk) {
@@ -1020,7 +1009,10 @@ async function loadGnafData(directory, {
   } else {
     // may21 was missing the counts file
     files = await getFiles('.', directory);
-    for (const file of files) {
+    // Only count lines for files we'll actually load (Authority Code + covered states).
+    // Counting all files (~5GB across all states) takes hours on CI runners.
+    const filesToCount = COVERED_STATES.length > 0 ? files.filter(f => f.match(/Authority/) || COVERED_STATES.some(s => _nodePath.default.basename(f).startsWith(`${s}_`))) : files;
+    for (const file of filesToCount) {
       const lines = await countFileLines(`${directory}/${file}`);
       filesCounts[file] = lines - 1;
     }
@@ -1040,7 +1032,7 @@ async function loadGnafData(directory, {
   const addressDetailFiles = files.filter(f => f.match(/ADDRESS_DETAIL/) && f.match(/\/Standard\//));
   logger('addressDetailFiles', addressDetailFiles);
   for (const detailFile of addressDetailFiles) {
-    const state = _nodePath2.default.basename(detailFile, _nodePath2.default.extname(detailFile)).replace(/_.*/, '');
+    const state = _nodePath.default.basename(detailFile, _nodePath.default.extname(detailFile)).replace(/_.*/, '');
     if (COVERED_STATES.length === 0 || COVERED_STATES.includes(state)) {
       loadContext.state = state;
       loadContext.stateName = await loadState(files, directory, state);
@@ -1085,7 +1077,7 @@ async function loadGnafData(directory, {
 }
 async function fileExists(countsFile) {
   try {
-    await fsp.access(countsFile, _nodeFs2.default.constants.F_OK);
+    await fsp.access(countsFile, _nodeFs.default.constants.F_OK);
     return true;
   } catch (error_) {
     error(error_);
@@ -1095,7 +1087,7 @@ async function fileExists(countsFile) {
 async function loadFileCounts(countsFile) {
   const filesCounts = {};
   await new Promise((resolve, reject) => {
-    _papaparse2.default.parse(_nodeFs2.default.createReadStream(countsFile), {
+    _papaparse.default.parse(_nodeFs.default.createReadStream(countsFile), {
       header: true,
       skipEmptyLines: true,
       step: function (row) {
@@ -1142,7 +1134,7 @@ async function loadStreetLocality(files, directory, state) {
     return [];
   } else {
     return await new Promise((resolve, reject) => {
-      _papaparse2.default.parse(_nodeFs2.default.createReadStream(`${directory}/${localityFile}`), {
+      _papaparse.default.parse(_nodeFs.default.createReadStream(`${directory}/${localityFile}`), {
         header: true,
         delimiter: '|',
         complete: results => {
@@ -1163,7 +1155,7 @@ async function loadLocality(files, directory, state) {
     return [];
   } else {
     return await new Promise((resolve, reject) => {
-      _papaparse2.default.parse(_nodeFs2.default.createReadStream(`${directory}/${localityFile}`), {
+      _papaparse.default.parse(_nodeFs.default.createReadStream(`${directory}/${localityFile}`), {
         header: true,
         delimiter: '|',
         complete: results => {
@@ -1187,7 +1179,7 @@ async function loadSiteGeo(files, directory, state, loadContext, filesCounts) {
     const expectedCount = filesCounts[geoFile];
     let count = 0;
     return await new Promise((resolve, reject) => {
-      _papaparse2.default.parse(_nodeFs2.default.createReadStream(`${directory}/${geoFile}`), {
+      _papaparse.default.parse(_nodeFs.default.createReadStream(`${directory}/${geoFile}`), {
         header: true,
         delimiter: '|',
         chunk: function (chunk, parser) {
@@ -1234,7 +1226,7 @@ async function loadDefaultGeo(files, directory, state, loadContext, filesCounts)
     const expectedCount = filesCounts[geoFile];
     let count = 0;
     return await new Promise((resolve, reject) => {
-      _papaparse2.default.parse(_nodeFs2.default.createReadStream(`${directory}/${geoFile}`), {
+      _papaparse.default.parse(_nodeFs.default.createReadStream(`${directory}/${geoFile}`), {
         header: true,
         delimiter: '|',
         chunk: function (chunk, parser) {
@@ -1275,9 +1267,9 @@ async function loadAuthFiles(files, directory, loadContext, filesCounts) {
   const authCodeFiles = files.filter(f => f.match(/Authority Code/));
   logger('authCodeFiles', authCodeFiles);
   for (const authFile of authCodeFiles) {
-    const contextKey = _nodePath2.default.basename(authFile, _nodePath2.default.extname(authFile));
+    const contextKey = _nodePath.default.basename(authFile, _nodePath.default.extname(authFile));
     await new Promise((resolve, reject) => {
-      _papaparse2.default.parse(_nodeFs2.default.createReadStream(`${directory}/${authFile}`), {
+      _papaparse.default.parse(_nodeFs.default.createReadStream(`${directory}/${authFile}`), {
         delimiter: '|',
         header: true,
         complete: function (results) {
@@ -1304,22 +1296,29 @@ async function loadAuthFiles(files, directory, loadContext, filesCounts) {
 async function loadGnaf({
   refresh = false
 } = {}) {
-  const file = await fetchGnafFile();
-  const unzipped = await unzipFile(file);
-  logger('Data dir', unzipped);
-  const contents = await fsp.readdir(unzipped);
-  logger('Data dir contents', contents);
-  if (contents.length === 0) {
-    throw new Error(`Data dir '${unzipped}' is empty`);
-  }
-  const gnafDir = await (0, _globPromise2.default)('**/G-NAF/', {
-    cwd: unzipped
-  });
-  console.log(gnafDir);
-  if (gnafDir.length === 0) {
-    throw new Error(`Cannot find 'G-NAF' directory in Data dir '${unzipped}'`);
+  let mainDirectory;
+  if (process.env.GNAF_TEST_FIXTURE_DIR) {
+    // Skip download, extraction, and directory scanning — use pre-prepared fixture.
+    mainDirectory = process.env.GNAF_TEST_FIXTURE_DIR;
+    logger('Using test fixture dir', mainDirectory);
+  } else {
+    const file = await fetchGnafFile();
+    const unzipped = await unzipFile(file);
+    logger('Data dir', unzipped);
+    const contents = await fsp.readdir(unzipped);
+    logger('Data dir contents', contents);
+    if (contents.length === 0) {
+      throw new Error(`Data dir '${unzipped}' is empty`);
+    }
+    const gnafDir = await (0, _glob.glob)('**/G-NAF/', {
+      cwd: unzipped
+    });
+    console.log(gnafDir);
+    if (gnafDir.length === 0) {
+      throw new Error(`Cannot find 'G-NAF' directory in Data dir '${unzipped}'`);
+    }
+    mainDirectory = _nodePath.default.dirname(`${unzipped}/${gnafDir[0].slice(0, -1)}`);
   }
-  const mainDirectory = _nodePath2.default.dirname(`${unzipped}/${gnafDir[0].slice(0, -1)}`);
   logger('Main Data dir', mainDirectory);
   await loadGnafData(mainDirectory, {
     refresh
@@ -1346,13 +1345,13 @@ async function getAddress(addressId) {
     };
     logger('json', json);
     delete json._id;
-    const link = new _httpLinkHeader2.default();
+    const link = new _httpLinkHeader.default();
     link.set({
       rel: 'self',
       uri: `/addresses/${addressId}`
     });
     // TODO: store hash in address
-    const hash = _nodeCrypto2.default.createHash('md5').update(JSON.stringify(json)).digest('hex');
+    const hash = _nodeCrypto.default.createHash('md5').update(JSON.stringify(json)).digest('hex');
     return {
       link,
       json,
@@ -1397,7 +1396,7 @@ async function getAddresses(url, swagger, q, p = 1) {
   try {
     const foundAddresses = await searchForAddress(q, p);
     logger('foundAddresses', foundAddresses);
-    const link = new _httpLinkHeader2.default();
+    const link = new _httpLinkHeader.default();
     link.set({
       rel: 'describedby',
       uri: `/docs/#operations-${swagger.path.get['x-swagger-router-controller'].toLowerCase()}-${swagger.path.get.operationId}`,
@@ -1454,7 +1453,7 @@ async function getAddresses(url, swagger, q, p = 1) {
     }
     const responseBody = mapToSearchAddressResponse(foundAddresses);
     logger('responseBody', JSON.stringify(responseBody, undefined, 2));
-    const linkTemplate = new _httpLinkHeader2.default();
+    const linkTemplate = new _httpLinkHeader.default();
     const op = swagger.path.get;
     (0, _setLinkOptions.setLinkOptions)(op, url, linkTemplate);
     return {

package/lib/service/printVersion.js

@@ -4,11 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.printVersion = printVersion;
-var _dotenv = require("dotenv");
-var _dotenv2 = _interopRequireDefault(_dotenv);
+var _dotenv = _interopRequireDefault(require("dotenv"));
 var _version = require("../version");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-_dotenv2.default.config();
+_dotenv.default.config();
 function printVersion() {
   let environment = process.env.NODE_ENV || 'development';
   if (environment === 'development') {

package/lib/src/server2.js

@@ -1,12 +1,11 @@
 "use strict";
 
-var _debug = require("debug");
-var _debug2 = _interopRequireDefault(_debug);
+var _debug = _interopRequireDefault(require("debug"));
 var _elasticsearch = require("../client/elasticsearch");
 var _printVersion = require("../service/printVersion");
 var _waycharterServer = require("./waycharterServer");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const logger = (0, _debug2.default)('api');
+const logger = (0, _debug.default)('api');
 (0, _waycharterServer.startRest2Server)().then(() => {
   logger('connecting es client');
   const p1 = (0, _elasticsearch.esConnect)().then(esClient => {

package/lib/src/waycharterServer.js

@@ -5,27 +5,23 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.startRest2Server = startRest2Server;
 exports.stopServer = stopServer;
-var _debug = require("debug");
-var _debug2 = _interopRequireDefault(_debug);
-var _express = require("express");
-var _express2 = _interopRequireDefault(_express);
+var _debug = _interopRequireDefault(require("debug"));
+var _express = _interopRequireDefault(require("express"));
 var _nodeHttp = require("node:http");
 var _waycharter = require("@mountainpass/waycharter");
 var _addressService = require("../service/address-service");
 var _version = require("../version");
-var _nodeCrypto = require("node:crypto");
-var _nodeCrypto2 = _interopRequireDefault(_nodeCrypto);
+var _nodeCrypto = _interopRequireDefault(require("node:crypto"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 //import connect from 'connect';
 
-var app = (0, _express2.default)();
+var app = (0, _express.default)();
 const ONE_DAY = 60 * 60 * 24;
 const ONE_WEEK = ONE_DAY * 7;
 var serverPort = process.env.PORT || 8080;
-var logger = (0, _debug2.default)('api');
-var error = (0, _debug2.default)('error');
-error.log = console.error.bind(console); // eslint-disable-line no-console
-
+var logger = (0, _debug.default)('api');
+var error = (0, _debug.default)('error');
+error.log = console.error.bind(console);
 let server;
 const PAGE_SIZE = process.env.PAGE_SIZE || 8;
 function startRest2Server() {
@@ -85,7 +81,7 @@ function startRest2Server() {
             pid: h._id.replace('/addresses/', '')
           };
         });
-        const responseHash = _nodeCrypto2.default.createHash('md5').update(JSON.stringify(body)).digest('hex');
+        const responseHash = _nodeCrypto.default.createHash('md5').update(JSON.stringify(body)).digest('hex');
         return {
           body,
           hasMore: page < foundAddresses.body.hits.total.value / PAGE_SIZE - 1,
@@ -111,7 +107,7 @@ function startRest2Server() {
       parameters: ['q']
     }]
   });
-  const healthType = waycharter.registerResourceType({
+  waycharter.registerResourceType({
     path: '/health',
     loader: async () => {
       return {
@@ -126,14 +122,14 @@ function startRest2Server() {
       };
     }
   });
-  const index = waycharter.registerResourceType({
+  waycharter.registerResourceType({
     path: '/',
     loader: async () => {
       return {
         body: {},
         links: [...addressesType.additionalPaths, {
           rel: 'https://addressr.io/rels/health',
-          path: '/health'
+          uri: '/health'
         }],
         headers: {
           etag: `"${_version.version}"`,

package/lib/swagger.js

@@ -3,38 +3,35 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.swaggerDoc = undefined;
-exports.swaggerInit = swaggerInit;
 exports.startServer = startServer;
 exports.stopServer = stopServer;
-var _debug = require("debug");
-var _debug2 = _interopRequireDefault(_debug);
-var _express = require("express");
-var _express2 = _interopRequireDefault(_express);
+exports.swaggerDoc = void 0;
+exports.swaggerInit = swaggerInit;
+var _debug = _interopRequireDefault(require("debug"));
+var _express = _interopRequireDefault(require("express"));
 var _nodeFs = require("node:fs");
 var _nodeHttp = require("node:http");
 var _jsYaml = require("js-yaml");
-var _nodePath = require("node:path");
-var _nodePath2 = _interopRequireDefault(_nodePath);
+var _nodePath = _interopRequireDefault(require("node:path"));
 var _swaggerTools = require("swagger-tools");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 //import connect from 'connect';
 
-var app = (0, _express2.default)();
+var app = (0, _express.default)();
 var serverPort = process.env.PORT || 8080;
-var logger = (0, _debug2.default)('api');
-var error = (0, _debug2.default)('error');
-error.log = console.error.bind(console); // eslint-disable-line no-console
+var logger = (0, _debug.default)('api');
+var error = (0, _debug.default)('error');
+error.log = console.error.bind(console);
 
 // swaggerRouter configuration
 var options = {
-  swaggerUi: _nodePath2.default.join(__dirname, '/swagger.json'),
-  controllers: _nodePath2.default.join(__dirname, './controllers'),
+  swaggerUi: _nodePath.default.join(__dirname, '/swagger.json'),
+  controllers: _nodePath.default.join(__dirname, './controllers'),
   useStubs: process.env.NODE_ENV === 'development' // Conditionally turn on stubs (mock mode)
 };
 
 // The Swagger document (require it, build it programmatically, fetch it from a URL, ...)
-var spec = (0, _nodeFs.readFileSync)(_nodePath2.default.join(__dirname, 'api/swagger.yaml'), 'utf8');
+var spec = (0, _nodeFs.readFileSync)(_nodePath.default.join(__dirname, 'api/swagger.yaml'), 'utf8');
 var swaggerDoc = exports.swaggerDoc = (0, _jsYaml.load)(spec);
 global.swaggerDoc = swaggerDoc;
 function swaggerInit() {
@@ -111,12 +108,6 @@ function startServer() {
     server.listen(serverPort, function () {
       logger('📡  Addressr is listening on port %d ( http://localhost:%d ) ', serverPort, serverPort);
       logger('📑  Swagger-ui is available on http://localhost:%d/docs', serverPort);
-      if (process.env.NODE_ENV !== 'PRODUCTION') {
-        // ngrok.connect(serverPort).then(url => {
-        //   logger('📡  Addressr is listening at %s', url);
-        //   logger('📑  Swagger-ui is available on %s/docs/', url);
-        // });
-      }
     });
     return `http://localhost:${serverPort}`;
   });

package/lib/utils/stream-down.js

@@ -1,7 +1,6 @@
 "use strict";
 
-var _progress = require("progress");
-var _progress2 = _interopRequireDefault(_progress);
+var _progress = _interopRequireDefault(require("progress"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const {
   parse
@@ -20,7 +19,7 @@ module.exports = function (url, path, size) {
       const length = res.headers['content-length'] ? Number.parseInt(res.headers['content-length'], 10) : size;
       //   let downloaded = 0;
       //   let percent = 0;
-      var bar = new _progress2.default('  downloading [:bar] :rate/bps :percent :etas', {
+      var bar = new _progress.default('  downloading [:bar] :rate/bps :percent :etas', {
         complete: '=',
         incomplete: ' ',
         width: 20,

package/lib/version.js

@@ -3,5 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.version = void 0;
 // Generated by genversion.
-const version = exports.version = '1.1.8';
+const version = exports.version = '2.0.0';