@mountainpass/addressr 1.0.260 → 1.0.263

package/lib/client/elasticsearch.js

@@ -16,7 +16,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const waitPort = require('wait-port');
 
-const elasticsearch = require('@elastic/elasticsearch');
+const elasticsearch = require('@opensearch-project/opensearch');
 
 const logger = (0, _debug2.default)('api');
 const error = (0, _debug2.default)('error');

package/lib/service/address-service.js

@@ -68,6 +68,10 @@ var _crypto = require("crypto");
 
 var _crypto2 = _interopRequireDefault(_crypto);
 
+var _globPromise = require("glob-promise");
+
+var _globPromise2 = _interopRequireDefault(_globPromise);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /* eslint-disable eslint-comments/disable-enable-pair */
@@ -606,7 +610,7 @@ function mapToMla(s) {
 
   if (s.lotNumber && s.number === undefined) {
     number = `LOT ${s.lotNumber.prefix || ''}${s.lotNumber.number || ''}${s.lotNumber.suffix || ''}`;
-  } else {
+  } else if (s.number) {
     number = `${s.number.prefix || ''}${s.number.number || ''}${s.number.suffix || ''}`;
 
     if (s.number.last) {
@@ -1086,7 +1090,8 @@ const {
 } = require('fs').promises;
 
 async function getFiles(currentDir, baseDir) {
-  const dir = resolve(baseDir, currentDir);
+  const dir = _path2.default.resolve(baseDir, currentDir);
+
   logger(`reading ${dir} (${currentDir} in ${baseDir})`);
   const dirents = await readdir(dir, {
     withFileTypes: true
@@ -1456,23 +1461,21 @@ async function loadGnaf({
     throw new Error(`Data dir '${unzipped}' is empty`);
   }
 
-  if (contents.length == 1) {
-    // before feb20, the gnaf zip had an intermediate directory
-    const mainDirectory = `${unzipped}/${contents[0]}`;
-    logger('1. Main Data dir', mainDirectory);
-    await loadGnafData(mainDirectory, {
-      refresh
-    });
-  } else if (contents.includes('Counts.csv')) {
-    // feb20 doesn't have an intermediate directory
-    const mainDirectory = unzipped;
-    logger('2. Main Data dir', mainDirectory);
-    await loadGnafData(mainDirectory, {
-      refresh
-    });
-  } else {
-    throw new Error(`Data dir '${unzipped}' has unexpected contents: ${contents}`);
+  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}'`);
   }
+
+  const mainDirectory = _path2.default.dirname(`${unzipped}/${gnafDir[0].slice(0, -1)}`);
+
+  logger('Main Data dir', mainDirectory);
+  await loadGnafData(mainDirectory, {
+    refresh
+  });
 }
 /**
  * Get Addresses

package/lib/version.js

@@ -4,4 +4,4 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 // generated by genversion
-const version = exports.version = '1.0.260';
+const version = exports.version = '1.0.263';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mountainpass/addressr",
-  "version": "1.0.260",
+  "version": "1.0.263",
   "description": "Australian Address Validation, Search and Autocomplete",
   "author": "Mountain Pass <addressr@mountain-pass.com.au>",
   "contributors": [
@@ -40,7 +40,7 @@
     "start:loader:geo:WA:prod": ". .env && COVERED_STATES=WA PORT=$npm_package_config_localport NODE_OPTIONS=--max_old_space_size=8196 babel-node loader.js ",
     "start:server:OT": "ES_INDEX_NAME=ot  DEBUG=error,api,express:*,swagger-tools*,test,es PORT=$npm_package_config_localport babel-node server.js",
     "start:server": "DEBUG=error,api,express:*,swagger-tools*,test,es PORT=$npm_package_config_localport babel-node server.js",
-    "start:server:prod": ". .env && PORT=$npm_package_config_localport DEBUG=error,api,express:*,swagger-tools*,test,es babel-node server.js",
+    "start:server:prod": ". .env && PORT=$npm_package_config_localport DEBUG=error babel-node server.js",
     "start:server2:prod": ". .env && ADDRESSR_ACCESS_CONTROL_ALLOW_ORIGIN=null ADDRESSR_ACCESS_CONTROL_EXPOSE_HEADERS=* PORT=$npm_package_config_localport DEBUG=error,api,express:*,swagger-tools*,test,es babel-node src/server2.js",
     "start:server:OT:prod": ". .env && ES_INDEX_NAME=ot PORT=$npm_package_config_localport DEBUG=error,api,express:*,swagger-tools*,test,es babel-node server.js",
     "start:server:preinstalled": "ES_INDEX_NAME=test DEBUG=error,api,express:*,swagger-tools*,test,es  PORT=$npm_package_config_localport addressr-server",
@@ -101,7 +101,8 @@
     "docker:push": "docker push \"mountainpass/addressr:${npm_package_version}\"",
     "postdocker:push": "docker push \"mountainpass/addressr:latest\"",
     "check-licenses": "license-checker --production --onlyAllow 'MIT;Apache-2.0;ISC;Custom: http://github.com/substack/node-bufferlist;Unlicense;BSD-2-Clause;BSD-3-Clause;WTFPL;0BSD;MIT*' --summary",
-    "pre-commit": "lint-staged && npm run check-licenses"
+    "pre-commit": "lint-staged && npm run check-licenses",
+    "test:performance": "k6 run --out csv=target/stress.csv test/k6/script.js"
   },
   "bin": {
     "addressr-loader": "lib/bin/addressr-loader.js",
@@ -131,12 +132,14 @@
   "license": "Apache-2.0",
   "private": false,
   "dependencies": {
-    "@elastic/elasticsearch": "^7.13.0",
     "@mountainpass/waycharter": "^1.0.68",
+    "@opensearch-project/opensearch": "^2.0.0",
     "debug": "^4.1.1",
     "directory-exists": "^2.0.1",
     "dotenv": "^10.0.0",
     "express": "^4.17.1",
+    "glob": "^7.1.7",
+    "glob-promise": "^4.2.0",
     "got": "^9.6.0",
     "http-link-header": "1.0.2",
     "js-yaml": "^3.3.0",