@mountainpass/addressr 1.0.268 → 1.1.0

package/README.md

@@ -165,6 +165,12 @@ Or for peace of mind for your mission critical solutions, get commercial support
 | ELASTIC_PASSWORD     | _blank_     | Connect to open search without authentication      | ✅      |
 | ELASTIC_PASSWORD     | _non-blank_ | Connect to open search with the specified password |         |
 | PAGE_SIZE            | 8           | Number or records to return in a search               | ✅      |
+| ADDRESSR_ACCESS_CONTROL_ALLOW_ORIGIN | _blank_ | An `Access-Control-Allow-Origin` response header is **not** returned | ✅      |
+| ADDRESSR_ACCESS_CONTROL_ALLOW_ORIGIN | _non-blank_ | An `Access-Control-Allow-Origin` response header is returned with the value in the environment variable |       |
+| ADDRESSR_ACCESS_CONTROL_EXPOSE_HEADERS | _blank_ | An `Access-Control-Expose-Headers` response header is **not** returned | ✅      |
+| ADDRESSR_ACCESS_CONTROL_EXPOSE_HEADERS | _non-blank_ | An `Access-Control-Expose-Headers` response header is returned with the value in the environment variable |       |
+| ADDRESSR_ACCESS_CONTROL_ALLOW_HEADERS | _blank_ | An `Access-Control-Allow-Headers` response header is **not** returned | ✅      |
+| ADDRESSR_ACCESS_CONTROL_ALLOW_HEADERS | _non-blank_ | An `Access-Control-Allow-Headers` response header is returned with the value in the environment variable |       |
 
 NOTE: When adjusting PAGE_SIZE, you should take into account how quickly you want the initial results returned to the user. In many use cases, you want this to be as fast as possible. If you need show more results to the user, you are often better off leaving it a 8 and using the paging links to get more results while you are displaying the first 8.
 

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/src/waycharterServer.js

@@ -50,6 +50,10 @@ function startRest2Server() {
       response.append('Access-Control-Expose-Headers', process.env.ADDRESSR_ACCESS_CONTROL_EXPOSE_HEADERS);
     }
 
+    if (process.env.ADDRESSR_ACCESS_CONTROL_ALLOW_HEADERS !== undefined) {
+      response.append('Access-Control-Allow-Headers', process.env.ADDRESSR_ACCESS_CONTROL_ALLOW_HEADERS);
+    }
+
     next();
   });
   const waycharter = new _waycharter.WayCharter();

package/lib/swagger.js

@@ -112,6 +112,10 @@ function startServer() {
       response.append('Access-Control-Expose-Headers', process.env.ADDRESSR_ACCESS_CONTROL_EXPOSE_HEADERS);
     }
 
+    if (process.env.ADDRESSR_ACCESS_CONTROL_ALLOW_HEADERS !== undefined) {
+      response.append('Access-Control-Allow-Headers', process.env.ADDRESSR_ACCESS_CONTROL_ALLOW_HEADERS);
+    }
+
     next();
   });
   return swaggerInit().then(({

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.1.0';

package/package.json

@@ -1,21 +1,31 @@
 {
   "name": "@mountainpass/addressr",
-  "version": "1.0.268",
+  "version": "1.1.0",
   "description": "Australian Address Validation, Search and Autocomplete",
-  "author": "Mountain Pass <addressr@mountain-pass.com.au>",
+  "author": {
+    "name": "Mountain Pass",
+    "url": "https://mountain-pass.com.au"
+  },
   "contributors": [
     "Tom Howard <tom@mountain-pass.com.au>"
   ],
+  "publishConfig": {
+    "access": "public"
+  },
   "engines": {
     "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",
+    "turbo:build": "turbo run build",
+    "turbo:ci:version": "turbo run ci:version",
+    "turbo:ci:publish": "turbo run ci:publish",
+    "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 +52,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",
@@ -104,7 +114,10 @@
     "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",
-    "test:performance": "k6 run --out csv=target/stress.csv test/k6/script.js"
+    "test:performance": "k6 run --out csv=target/stress.csv test/k6/script.js",
+    "add-changeset": "changeset add --open",
+    "ci:version": "[ \"$CI\" = true ] && changeset version || echo \"Dry run: changeset version\"",
+    "ci:publish": "[ \"$CI\" = true ] && changeset publish || echo \"Dry run: changeset publish\""
   },
   "bin": {
     "addressr-loader": "lib/bin/addressr-loader.js",
@@ -134,6 +147,7 @@
   "license": "Apache-2.0",
   "private": false,
   "dependencies": {
+    "@changesets/cli": "^2.26.2",
     "@mountainpass/waycharter": "^1.0.68",
     "@opensearch-project/opensearch": "^2.0.0",
     "debug": "^4.1.1",
@@ -152,8 +166,8 @@
     "papaparse": "^5.0.0",
     "progress": "^2.0.3",
     "semver": "^7.3.2",
-    "shelljs": "^0.8.5",
     "swagger-tools": "^0.10.4",
+    "turbo": "^1.10.15",
     "unzip-stream": "^0.3.0",
     "uri-template-lite": "^20.5.0",
     "wait-port": "^0.2.2"
@@ -169,17 +183,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 +209,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",
@@ -239,4 +248,4 @@
       "pre-commit": "npm run pre-commit"
     }
   }
-}
+}