@mountainpass/addressr 1.0.265 → 1.0.267

package/README.md

@@ -14,7 +14,6 @@
 
 ![Uptime Robot ratio (30 days)](https://img.shields.io/uptimerobot/ratio/m788652244-3e35661f9886333310f4dc2f?logo=data:image/png;base64,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)
 
-
 # About
 
 Australian Address Validation, Search and Autocomplete
@@ -65,7 +64,7 @@ Or for peace of mind for your mission critical solutions, get commercial support
   - [How it Works](#how-it-works)
   - [Additional Settings](#additional-settings)
   - [System requirements](#system-requirements)
-    - [Elastic Search:](#elastic-search)
+    - [Open Search](#open-search)
     - [Addressr Loader](#addressr-loader)
       - [Default](#default)
       - [With Geocoding enabled](#with-geocoding-enabled)
@@ -76,21 +75,27 @@ Or for peace of mind for your mission critical solutions, get commercial support
 ## Self Hosted
 
 1. Install addressr
+
    ```
    npm install @mountainpass/addressr -g
    ```
+
    NOTE: If you are running windows, you'll need to use [wsl](https://docs.microsoft.com/en-us/windows/wsl/install-win10)
-2. Start elastic search. For example run
+2. Start open search. For example run
+
    ```
-   docker pull docker.elastic.co/elasticsearch/elasticsearch:7.9.2
-   docker run -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch:7.9.2
+   docker pull opensearchproject/opensearch:1.2.4
+   docker run -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" -e "plugins.security.disabled=true" opensearchproject/opensearch:1.2.4
    ```
+
 3. Start API server. In a second window run:
-   ```
+
+   ```sh
    export ELASTIC_PORT=9200
    export ELASTIC_HOST=localhost
    addressr-server-2
    ```
+
 4. Setup the env vars for the data loader. In a third window run:
 
    ```
@@ -130,16 +135,20 @@ Or for peace of mind for your mission critical solutions, get commercial support
    - WA
 
 5. Run data Loader. In the third window run:
+
    ```
    addressr-loader
    ```
-6. OK, so we stretched the truth a bit with the "Quick Start" heading. The truth is that it takes quite a while to download, store and index the 13+ million addresses from data.gov.au. So make a coffee, or tea, or find something else to do and come back in about an hour when it's done.
+
+6. OK, so we stretched the truth a bit with the "Quick Start" heading. The truth is that it takes quite a while to download, store and index the 13+ million addresses from [data.gov.au](http://data.gov.au/). So make a coffee, or tea, or find something else to do and come back in about an hour when it's done.
 7. Search for an address using the command line
+
    ```
    curl -i http://localhost:8080/addresses?q=LEVEL+25,+TOWER+3
    ```
+
 8. An updated G-NAF is released every 3 months. Put `addressr-loader` in a cron job or similar to keep addressr regularly updated
-9. Wire you address form up to the address-server api. The easiest way to do this is by using the [waychaser](https://waychaser.io) library as follows
+9. Wire you address form up to the address-server api.
 
 ## How it Works
 
@@ -149,38 +158,34 @@ Or for peace of mind for your mission critical solutions, get commercial support
 
 | Environment Variable | Value       | Description                                           | Default |
 | -------------------- | ----------- | ----------------------------------------------------- | ------- |
-| ELASTIC_PROTOCOL     | http        | Connect to elastic search over http                   | ✅      |
-| ELASTIC_PROTOCOL     | https       | Connect to elastic search over https                  |         |
-| ELASTIC_USERNAME     | _blank_     | Connect to elastic search without authentication      | ✅      |
-| ELASTIC_USERNAME     | _non-blank_ | Connect to elastic search with the specified username |         |
-| ELASTIC_PASSWORD     | _blank_     | Connect to elastic search without authentication      | ✅      |
-| ELASTIC_PASSWORD     | _non-blank_ | Connect to elastic search with the specified password |         |
-| ELASTIC_PASSWORD     | _non-blank_ | Connect to elastic search with the specified password |         |
+| ELASTIC_PROTOCOL     | http        | Connect to open search over http                   | ✅      |
+| ELASTIC_PROTOCOL     | https       | Connect to open search over https                  |         |
+| ELASTIC_USERNAME     | _blank_     | Connect to open search without authentication      | ✅      |
+| ELASTIC_USERNAME     | _non-blank_ | Connect to open search with the specified username |         |
+| 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               | ✅      |
 
-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.
+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.
 
 Why is the default 8 and not 10? [Mechanical Sympathy](https://dzone.com/articles/mechanical-sympathy)
 
 ## System requirements
 
-### Elastic Search:
+### Open Search
 
-elasticsearch-oss >= 7.9.2 with 1.4GiB of memory
+opensearch >= 1.2.4 with 1.4GiB of memory
 
 ### Addressr Loader
 
 #### Default
 
-Node JS >= 11.14.0 with 1GiB of memory
+Node.js >= 12.11.0 with 1GiB of memory
 
 #### With Geocoding enabled
 
-Node JS >= 11.14.0 with 8GiB of memory
+Node.js >= 12.11.0 with 8GiB of memory
 
 ### Addressr Server
 
-Node JS >= 11.14.0 with 64MiB of memory
+Node.js >= 12.11.0 with 64MiB of memory

package/api/swagger-2.yaml

@@ -397,7 +397,7 @@ definitions:
                 example: RMB
                 maxLength: 3
               number:
-                type: string
+                type: integer
                 example: '20114'
                 maxLength: 6
               suffix:

package/api/swagger.yaml

@@ -411,7 +411,7 @@ definitions:
                 example: RMB
                 maxLength: 3
               number:
-                type: string
+                type: integer
                 example: '20114'
                 maxLength: 6
               suffix:

package/lib/api/swagger-2.yaml

@@ -397,7 +397,7 @@ definitions:
                 example: RMB
                 maxLength: 3
               number:
-                type: string
+                type: integer
                 example: '20114'
                 maxLength: 6
               suffix:

package/lib/api/swagger.yaml

@@ -411,7 +411,7 @@ definitions:
                 example: RMB
                 maxLength: 3
               number:
-                type: string
+                type: integer
                 example: '20114'
                 maxLength: 6
               suffix:

package/lib/ci/build.js

@@ -0,0 +1,39 @@
+#!/usr/bin/env node
+// Use Node 16 or above to run this script.
+// `node build.js` will run this script.
+//
+// This script will call various NPM commands to build the application
+// using the Docker images as per the settings below
+// Overall
+// Node 16 on CI server (GitHub Actions) calls this script
+// This script calls NPM commands.
+// NPM commands call shell scripts.
+
+/*
+Stuff like deploy should use dagger.io because it has specific dependencies like terraform
+or we could have convetions in the npm scripts that they call dagger.io if needed but otherwise
+they're just normal npm scripts.
+
+In this way dagger becomes our way to compose and orchestrate our build and deploy scripts
+
+actions:
+    scripts for doing stuff.
+
+
+*/
+"use strict";
+
+var _dagger = require("@dagger.io/dagger");
+
+// initialize Dagger client
+console.log('starting...');
+(0, _dagger.connect)(async client => {
+  // get reference to the local project
+  const source = client.host().directory("."); // get Node image
+
+  const node = client.container().from("node:12.11.0"); // mount cloned repository into Node image
+
+  const runner = client.container({
+    id: node
+  }).withMountedDirectory("/src", source).withWorkdir("/src").withExec(["npm", "run", "hello"]);
+});

package/lib/ci/pipeline.js

@@ -0,0 +1,80 @@
+#!/usr/bin/env node
+// Use Node 16 or above to run this script.
+// `node build.js` will run this script.
+//
+// This script will call various NPM commands to build the application
+// using the Docker images as per the settings below
+// Overall
+// Node 16 on CI server (GitHub Actions) calls this script
+// This script calls NPM commands.
+// NPM commands call shell scripts.
+
+/*
+Stuff like deploy should use dagger.io because it has specific dependencies like terraform
+or we could have convetions in the npm scripts that they call dagger.io if needed but otherwise
+they're just normal npm scripts.
+
+In this way dagger becomes our way to compose and orchestrate our build and deploy scripts
+
+actions:
+    scripts for doing stuff.
+
+
+*/
+"use strict";
+
+var _dagger = require("@dagger.io/dagger");
+
+var _envPaths = require("env-paths");
+
+var _envPaths2 = _interopRequireDefault(_envPaths);
+
+var _fs = require("fs");
+
+var _fs2 = _interopRequireDefault(_fs);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const cacheDir = `${(0, _envPaths2.default)("", {
+  suffix: ""
+}).cache}/dagger`;
+const binLocation = `${cacheDir}/dagger-0.3.9`;
+
+if (!process.env._EXPERIMENTAL_DAGGER_CLI_BIN && _fs2.default.existsSync(binLocation)) {
+  process.env._EXPERIMENTAL_DAGGER_CLI_BIN = binLocation;
+  console.log(`using already downloaded '${binLocation}'`);
+}
+
+console.log('connecting...');
+(0, _dagger.connect)(async client => {
+  console.log('\t...connected'); // get reference to the local project
+
+  client.log;
+  const workspace = client.host().directory("."); //, { exclude: ["node_modules/"] })
+  // get Node image
+
+  const node = client.container().from("node:14.21.2").withMountedDirectory("/workspace", workspace).withWorkdir("/workspace");
+  console.log(await node.withExec(["npm", "--version"]).stdout());
+  const installed = node; //     .withExec(["npm", "install"])
+  // const exitCode = await installed.exitCode()
+  // console.log({ exitCode });
+  // const stdout = await installed.stdout()
+  // const stderr = await installed.stderr()
+  // const version = await node.withExec(["node", "-v"]).stdout()
+  // print output
+  // 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
+              npm run check-licenses
+              npm run cover:nodejs:nogeo
+              npm run cover:rest:nogeo
+  */
+
+  installed.withExec(["npm", "run", "build"]); // await runner.exitCode()
+  // .directory("node_modules/")
+  // .export("./dagger_node_modules")
+});

package/lib/dagger-version.js

@@ -0,0 +1,7 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+// generated by genversion
+const version = exports.version = '1.0.263';

package/lib/deploy/create-deployment-archive.js

@@ -0,0 +1,81 @@
+#!/usr/bin/env node
+"use strict";
+
+const fs = require('fs');
+
+const packageJson = require('../package.json');
+
+const shell = require('shelljs');
+
+const {
+  zip
+} = require('zip-a-folder');
+/**
+Creates a deployment package.json file based of an existing package.json file
+The way AWS beanstalk node.js deployments work, is that they use the package.json
+to run `npm install` and then `npm start` to start the application.
+
+Doing it the AWS documented way with the original package.json, you'd basically download
+ALL of the dependencies (prod and dev), build the application (e.g. transpiling etc) and
+then start it. This can be quite slow and redundant if you've already built the application
+in your CI/CD. It works great for code that doesn't require transpiling, but for code that
+does, it's a bit of a waste.
+
+So, instead, we create a deployment package.json that depends on the original package.
+When AWS does it's thing, all it's downloading is the original package and it's dependencies
+and then starting the application. This is much faster and more efficient. In our experience
+this is much faster than both the AWS documented way and docker deployments. YMMV.
+
+TODO: Apparently if you include a node_modules folder in the deployment, AWS will use that
+instead of doing an npm install. This could be even faster, but we haven't tried it yet.
+See https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/nodejs-platform-dependencies.html#nodejs-platform-nodemodules
+**/
+
+
+function createPackageJson(context, filepath) {
+  const {
+    name,
+    version,
+    description,
+    author,
+    contributors,
+    engines,
+    keywords,
+    license,
+    private: privateKey,
+    repository,
+    bugs,
+    homepage
+  } = context;
+  const newPackageJson = {
+    "name": `${name}-deployment`,
+    version,
+    description,
+    author,
+    contributors,
+    engines,
+    keywords,
+    license,
+    private: privateKey,
+    repository,
+    bugs,
+    homepage,
+    "scripts": {
+      // TODO: see if we can use the context.main as the start script
+      "start": "addressr-server-2"
+    },
+    "dependencies": {
+      [name]: version
+    }
+  };
+  fs.writeFileSync(filepath, JSON.stringify(newPackageJson, null, 2));
+}
+
+async function createDeploymentArchive(deploymentDir) {
+  shell.mkdir('-p', deploymentDir);
+  createPackageJson(packageJson, `${deploymentDir}/package.json`);
+  const archiveName = packageJson.name.replace('@', '').replace('/', '-');
+  await zip(`${deploymentDir}/`, `${archiveName}-deployment-${packageJson.version}.zip`);
+}
+
+createDeploymentArchive('./deployment');

package/lib/service/address-service.js

@@ -1105,19 +1105,24 @@ async function getFiles(currentDir, baseDir) {
 
 function countFileLines(filePath) {
   return new Promise((resolve, reject) => {
-    let lineCount = 0;
-
-    _fs2.default.createReadStream(filePath).on('data', buffer => {
-      let idx = -1;
-      lineCount--; // Because the loop will run once for idx=-1
-
-      do {
-        idx = buffer.indexOf(10, idx + 1);
-        lineCount++;
-      } while (idx !== -1);
-    }).on('end', () => {
-      resolve(lineCount);
-    }).on('error', reject);
+    const readStream = _fs2.default.createReadStream(filePath, 'utf-8');
+
+    let lines = 0;
+    let last = undefined;
+    readStream.on('data', function (chunk) {
+      lines += chunk.split('\n').length - 1;
+      last = chunk[chunk.length - 1];
+    });
+    readStream.on('end', function () {
+      if (last !== '\n') {
+        ++lines;
+      }
+
+      resolve(lines);
+    });
+    readStream.on('error', function (err) {
+      reject(err);
+    });
   });
 }
 

package/lib/src/server2.js

@@ -8,8 +8,6 @@ var _elasticsearch = require("../client/elasticsearch");
 
 var _printVersion = require("../service/printVersion");
 
-var _swagger = require("../swagger");
-
 var _waycharterServer = require("./waycharterServer");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/src/waycharterServer.js

@@ -41,7 +41,7 @@ let server;
 const PAGE_SIZE = process.env.PAGE_SIZE || 8;
 
 function startRest2Server() {
-  app.use((request, response, next) => {
+  app.use((_request, response, next) => {
     if (process.env.ADDRESSR_ACCESS_CONTROL_ALLOW_ORIGIN !== undefined) {
       response.append('Access-Control-Allow-Origin', process.env.ADDRESSR_ACCESS_CONTROL_ALLOW_ORIGIN);
     }

package/lib/version.js

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

package/package.json

@@ -1,19 +1,21 @@
 {
   "name": "@mountainpass/addressr",
-  "version": "1.0.265",
+  "version": "1.0.267",
   "description": "Australian Address Validation, Search and Autocomplete",
   "author": "Mountain Pass <addressr@mountain-pass.com.au>",
   "contributors": [
     "Tom Howard <tom@mountain-pass.com.au>"
   ],
   "engines": {
-    "node": ">=12.11.0"
+    "node": ">=14.21.2"
   },
   "config": {
     "localport": "6060"
   },
   "scripts": {
-    "hmm": "echo mountainpass-addressr-${npm_package_version}.tgz",
+    "docs:build": "log4brains build",
+    "docs:preview": "log4brains preview",
+    "deploy": "deploy/deploy.sh",
     "requirements-check": "scripts/check-version.js",
     "postinstall": "npm run requirements-check",
     "prestart:loader:babel:OT": "npm run build && cp -r target lib/.",
@@ -40,7 +42,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 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: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",
@@ -150,6 +152,7 @@
     "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",
@@ -166,6 +169,7 @@
     "@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",
@@ -175,7 +179,7 @@
     "babel-preset-env": "^1.7.0",
     "chai": "^4.2.0",
     "cucumber": "^5.1.0",
-    "dockerode": "^3.3.0",
+    "dockerode": "^3.3.4",
     "eslint": "^7.9.0",
     "eslint-config-prettier": "^8.0.0",
     "eslint-plugin-chai-friendly": "^0.7.1",
@@ -194,13 +198,15 @@
     "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"
+    "prettier-config-standard": "^4.0.0",
+    "zip-a-folder": "^1.1.3"
   },
   "repository": {
     "type": "git",
@@ -209,7 +215,7 @@
   "bugs": {
     "url": "https://github.com/mountain-pass/addressr/issues"
   },
-  "homepage": "https://addressr.mountain-pass.com.au",
+  "homepage": "https://addressr.io",
   "lint-staged": {
     "*.{js,jsx}": [
       "eslint --fix",