@mountainpass/addressr 1.0.268 → 1.0.269

package/lib/service/address-service.js

@@ -364,7 +364,7 @@ async function unzipFile(file) {
 // }
 
 
-function levelTypeCodeToName(code, context) {
+function levelTypeCodeToName(code, context, address) {
   const found = context['Authority_Code_LEVEL_TYPE_AUT_psv'].find(entry => entry.CODE === code);
 
   if (found) {
@@ -372,10 +372,13 @@ function levelTypeCodeToName(code, context) {
   }
 
   error(`Unknown Level Type Code: '${code}'`);
+  error({
+    address
+  });
   return;
 }
 
-function flatTypeCodeToName(code, context) {
+function flatTypeCodeToName(code, context, address) {
   const found = context['Authority_Code_FLAT_TYPE_AUT_psv'].find(entry => entry.CODE === code);
 
   if (found) {
@@ -383,6 +386,9 @@ function flatTypeCodeToName(code, context) {
   }
 
   error(`Unknown Flat Type Code: '${code}'`);
+  error({
+    address
+  });
   return;
 }
 
@@ -720,7 +726,7 @@ function mapAddressDetails(d, context, i, count) {
         level: { ...(d.LEVEL_TYPE_CODE !== '' && {
             type: {
               code: d.LEVEL_TYPE_CODE,
-              name: levelTypeCodeToName(d.LEVEL_TYPE_CODE, context)
+              name: levelTypeCodeToName(d.LEVEL_TYPE_CODE, context, d)
             }
           }),
           ...(d.LEVEL_NUMBER_PREFIX !== '' && {
@@ -738,7 +744,7 @@ function mapAddressDetails(d, context, i, count) {
         flat: { ...(d.FLAT_TYPE_CODE !== '' && {
             type: {
               code: d.FLAT_TYPE_CODE,
-              name: flatTypeCodeToName(d.FLAT_TYPE_CODE, context)
+              name: flatTypeCodeToName(d.FLAT_TYPE_CODE, context, d)
             }
           }),
           ...(d.FLAT_NUMBER_PREFIX !== '' && {
@@ -821,45 +827,48 @@ async function loadAddressDetails(file, expectedCount, context, {
 
         if (chunk.errors.length > 0) {
           error(`Errors reading '${file}': ${chunk.errors}`);
-        } else {
-          const indexingBody = [];
-          chunk.data.forEach(row => {
-            const item = mapAddressDetails(row, context, actualCount, expectedCount);
-            items.push(item);
-            actualCount += 1;
-            indexingBody.push({
-              index: {
-                _index: ES_INDEX_NAME,
-                _id: `/addresses/${item.pid}`
-              }
-            });
-            const {
-              sla,
-              ssla,
-              ...structured
-            } = item;
-            indexingBody.push({
-              sla,
-              ssla,
-              structured,
-              confidence: structured.structured.confidence
-            });
+          error({
+            errors: chunk.errors
           });
+        }
 
-          if (indexingBody.length > 0) {
-            sendIndexRequest(indexingBody, undefined, {
-              refresh
-            }).then(() => {
-              parser.resume();
-              return;
-            }).catch(error_ => {
-              error('error sending index request', error_);
-              throw error_;
-            });
-          } else {
-            // nothing to process. Have reached end of file.
+        const indexingBody = [];
+        chunk.data.forEach(row => {
+          const item = mapAddressDetails(row, context, actualCount, expectedCount);
+          items.push(item);
+          actualCount += 1;
+          indexingBody.push({
+            index: {
+              _index: ES_INDEX_NAME,
+              _id: `/addresses/${item.pid}`
+            }
+          });
+          const {
+            sla,
+            ssla,
+            ...structured
+          } = item;
+          indexingBody.push({
+            sla,
+            ssla,
+            structured,
+            confidence: structured.structured.confidence
+          });
+        });
+
+        if (indexingBody.length > 0) {
+          sendIndexRequest(indexingBody, undefined, {
+            refresh
+          }).then(() => {
             parser.resume();
-          }
+            return;
+          }).catch(error_ => {
+            error('error sending index request', error_);
+            throw error_;
+          });
+        } else {
+          // nothing to process. Have reached end of file.
+          parser.resume();
         }
       },
       // step: function(row) {
@@ -1232,10 +1241,13 @@ async function loadFileCounts(countsFile) {
       step: function (row) {
         if (row.errors.length > 0) {
           error(`Errors reading '${countsFile}': ${row.errors}`);
-        } else {
-          const psvFile = row.data.File.replace(/\\/g, '/').replace(/\.zip$/, '.psv');
-          filesCounts[psvFile] = row.data.Count;
+          error({
+            errors: row.errors
+          });
         }
+
+        const psvFile = row.data.File.replace(/\\/g, '/').replace(/\.zip$/, '.psv');
+        filesCounts[psvFile] = row.data.Count;
       },
       complete: function () {
         console.log('GNAF data loaded');
@@ -1333,6 +1345,9 @@ async function loadSiteGeo(files, directory, state, loadContext, filesCounts) {
 
           if (chunk.errors.length > 0) {
             error(`Errors reading '${directory}/${geoFile}': ${chunk.errors}`);
+            error({
+              errors: chunk.errors
+            });
           } else {
             chunk.data.forEach(row => {
               if (expectedCount) {
@@ -1385,6 +1400,9 @@ async function loadDefaultGeo(files, directory, state, loadContext, filesCounts)
 
           if (chunk.errors.length > 0) {
             error(`Errors reading '${directory}/${geoFile}': ${chunk.errors}`);
+            error({
+              errors: chunk.errors
+            });
           } else {
             chunk.data.forEach(row => {
               if (expectedCount) {

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mountainpass/addressr",
-  "version": "1.0.268",
+  "version": "1.0.269",
   "description": "Australian Address Validation, Search and Autocomplete",
   "author": "Mountain Pass <addressr@mountain-pass.com.au>",
   "contributors": [
@@ -10,12 +10,13 @@
     "node": ">=14.21.2"
   },
   "config": {
-    "localport": "6060"
+    "localport": "6060",
+    "SEARCH_IMAGE": "opensearchproject/opensearch:1.2.4"
   },
   "scripts": {
-    "docs:build": "log4brains build",
-    "docs:preview": "log4brains preview",
-    "deploy": "deploy/deploy.sh",
+    "pull:open-search": "docker pull ${npm_package_config_SEARCH_IMAGE}",
+    "start:open-search": "docker run -p 9200:9200 -p 9300:9300 -e \"ES_JAVA_OPTS=-Xms1g -Xmx1g\" -e \"discovery.type=single-node\" -e \"plugins.security.disabled=true\" \"${npm_package_config_SEARCH_IMAGE}\"",
+    "hmm": "echo mountainpass-addressr-${npm_package_version}.tgz",
     "requirements-check": "scripts/check-version.js",
     "postinstall": "npm run requirements-check",
     "prestart:loader:babel:OT": "npm run build && cp -r target lib/.",
@@ -42,7 +43,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 src/server2.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",
@@ -152,7 +153,6 @@
     "papaparse": "^5.0.0",
     "progress": "^2.0.3",
     "semver": "^7.3.2",
-    "shelljs": "^0.8.5",
     "swagger-tools": "^0.10.4",
     "unzip-stream": "^0.3.0",
     "uri-template-lite": "^20.5.0",
@@ -169,17 +169,14 @@
     "@babel/preset-react": "^7.0.0",
     "@babel/register": "^7.7.0",
     "@babel/runtime": "^7.5.0",
-    "@dagger.io/dagger": "^0.3.1",
     "@istanbuljs/nyc-config-babel": "^3.0.0",
     "@mountainpass/waychaser": "^4.0.0",
     "@windyroad/cucumber-js-throwables": "^1.0.4",
-    "@windyroad/quick-containers-js": "^2.0.0",
     "babel-eslint": "^10.0.2",
     "babel-plugin-istanbul": "^6.0.0",
     "babel-preset-env": "^1.7.0",
     "chai": "^4.2.0",
     "cucumber": "^5.1.0",
-    "dockerode": "^3.3.4",
     "eslint": "^7.9.0",
     "eslint-config-prettier": "^8.0.0",
     "eslint-plugin-chai-friendly": "^0.7.1",
@@ -198,15 +195,13 @@
     "istanbul-middleware": "^0.2.2",
     "license-checker": "^25.0.1",
     "lint-staged": "^11.0.0",
-    "log4brains": "^1.0.1",
     "ngrok": "^4.0.1",
     "nodemon": "^2.0.4",
     "npm-check": "^5.9.0",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",
     "prettier": "^2.1.0",
-    "prettier-config-standard": "^4.0.0",
-    "zip-a-folder": "^1.1.3"
+    "prettier-config-standard": "^4.0.0"
   },
   "repository": {
     "type": "git",