@mountainpass/addressr 1.1.2 → 1.1.4

package/lib/service/printVersion.js

@@ -4,24 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.printVersion = printVersion;
-
 var _dotenv = require("dotenv");
-
 var _dotenv2 = _interopRequireDefault(_dotenv);
-
 var _version = require("../version");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 _dotenv2.default.config();
-
 function printVersion() {
   let environment = process.env.NODE_ENV || 'development';
-
   if (environment === 'development') {
     environment = `${environment}|(set NODE_ENV to 'production' in production environments)`;
   }
-
   const port = process.env.PORT || 8080;
   console.log(`Version: ${_version.version}`);
   console.log(`NODE_ENV: ${environment}`);

package/lib/service/setLinkOptions.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.setLinkOptions = setLinkOptions;
-
 var _jsonPtr = require("json-ptr");
-
 function setLinkOptions(op, url, linkTemplate) {
   if (op.parameters) {
     const parameters = op.parameters;

package/lib/src/server2.js

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

package/lib/src/waycharterServer.js

@@ -5,30 +5,19 @@ 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 _http = require("http");
-
 var _waycharter = require("@mountainpass/waycharter");
-
 var _addressService = require("../service/address-service");
-
 var _version = require("../version");
-
 var _crypto = require("crypto");
-
 var _crypto2 = _interopRequireDefault(_crypto);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 //import connect from 'connect';
+
 var app = (0, _express2.default)();
 const ONE_DAY = 60 * 60 * 24;
 const ONE_WEEK = ONE_DAY * 7;
@@ -39,21 +28,17 @@ error.log = console.error.bind(console); // eslint-disable-line no-console
 
 let server;
 const PAGE_SIZE = process.env.PAGE_SIZE || 8;
-
 function startRest2Server() {
   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);
     }
-
     if (process.env.ADDRESSR_ACCESS_CONTROL_EXPOSE_HEADERS !== undefined) {
       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();
@@ -100,9 +85,7 @@ function startRest2Server() {
             pid: h._id.replace('/addresses/', '')
           };
         });
-
         const responseHash = _crypto2.default.createHash('md5').update(JSON.stringify(body)).digest('hex');
-
         return {
           body,
           hasMore: page < foundAddresses.body.hits.total.value / PAGE_SIZE - 1,
@@ -128,12 +111,30 @@ function startRest2Server() {
       parameters: ['q']
     }]
   });
+  const healthType = waycharter.registerResourceType({
+    path: '/health',
+    loader: async () => {
+      return {
+        body: {
+          status: 'healthy',
+          version: _version.version,
+          timestamp: new Date().toISOString()
+        },
+        headers: {
+          'cache-control': 'no-cache'
+        }
+      };
+    }
+  });
   const index = waycharter.registerResourceType({
     path: '/',
     loader: async () => {
       return {
         body: {},
-        links: addressesType.additionalPaths,
+        links: [...addressesType.additionalPaths, {
+          rel: 'https://addressr.io/rels/health',
+          path: '/health'
+        }],
         headers: {
           etag: `"${_version.version}"`,
           'cache-control': `public, max-age=${ONE_WEEK}`
@@ -149,7 +150,6 @@ function startRest2Server() {
     });
   });
 }
-
 function stopServer() {
   if (server !== undefined) {
     server.close();

package/lib/swagger.js

@@ -7,83 +7,71 @@ 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);
-
 var _fs = require("fs");
-
 var _http = require("http");
-
 var _jsYaml = require("js-yaml");
-
 var _path = require("path");
-
 var _path2 = _interopRequireDefault(_path);
-
 var _swaggerTools = require("swagger-tools");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 //import connect from 'connect';
+
 var app = (0, _express2.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
-// swaggerRouter configuration
 
+// swaggerRouter configuration
 var options = {
   swaggerUi: _path2.default.join(__dirname, '/swagger.json'),
   controllers: _path2.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, ...)
-
+// The Swagger document (require it, build it programmatically, fetch it from a URL, ...)
 var spec = (0, _fs.readFileSync)(_path2.default.join(__dirname, 'api/swagger.yaml'), 'utf8');
 var swaggerDoc = exports.swaggerDoc = (0, _jsYaml.safeLoad)(spec);
 global.swaggerDoc = swaggerDoc;
-
 function swaggerInit() {
   // Initialize the Swagger middleware
   return new Promise(resolve => {
     (0, _swaggerTools.initializeMiddleware)(swaggerDoc, function (middleware) {
       // Interpret Swagger resources and attach metadata to request - must be first in swagger-tools middleware chain
       const metaData = middleware.swaggerMetadata();
-      app.use(metaData); // Validate Swagger requests
+      app.use(metaData);
 
+      // Validate Swagger requests
       app.use(middleware.swaggerValidator({
         validateResponse: process.env.NODE_ENV === undefined || process.env.NODE_ENV === 'development'
-      })); // Route validated requests to appropriate controller
+      }));
 
-      app.use(middleware.swaggerRouter(options)); // Serve the Swagger documents and Swagger UI
+      // Route validated requests to appropriate controller
+      app.use(middleware.swaggerRouter(options));
 
-      app.use(middleware.swaggerUi({// apiDocs: '/api-docs',
+      // Serve the Swagger documents and Swagger UI
+      app.use(middleware.swaggerUi({
+        // apiDocs: '/api-docs',
         // swaggerUi: '/docs',
       }));
       app.use(function (error_, request, res, next) {
         if (error_.failedValidation) {
           // handle validation errror
           const rehydratedError = Object.assign({}, error_);
-
           if (error_.originalResponse) {
             rehydratedError.originalResponse = JSON.parse(error_.originalResponse);
           }
-
           if (error_.message) {
             rehydratedError.message = error_.message;
           }
-
           if (error_.results) {
             rehydratedError.errors = error_.results.errors;
             delete rehydratedError.results;
           }
-
           error('error!!!', error_.message, JSON.stringify(rehydratedError, undefined, 2));
           res.status(error_.code === 'SCHEMA_VALIDATION_FAILED' ? '500' : '400').json(rehydratedError);
         } else {
@@ -99,38 +87,32 @@ function swaggerInit() {
     });
   });
 }
-
 let server;
-
 function startServer() {
   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);
     }
-
     if (process.env.ADDRESSR_ACCESS_CONTROL_EXPOSE_HEADERS !== undefined) {
       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(({
-    app
-    /*, middleware*/
-
+    app /*, middleware*/
   }) => {
     // logger(app);
     // logger(middleware);
+
     server = (0, _http.createServer)(app);
     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 => {
+      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);
         // });
@@ -139,7 +121,6 @@ function startServer() {
     return `http://localhost:${serverPort}`;
   });
 }
-
 function stopServer() {
   if (server !== undefined) {
     server.close();

package/lib/utils/stream-down.js

@@ -1,34 +1,25 @@
 "use strict";
 
 var _progress = require("progress");
-
 var _progress2 = _interopRequireDefault(_progress);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const {
   parse
 } = require('url');
-
 const http = require('https');
-
 const fs = require('fs');
-
 const pathUtil = require('path');
-
 module.exports = function (url, path, size) {
   const uri = parse(url);
-
   if (!path) {
     path = pathUtil.basename(uri.path);
   }
-
   const file = fs.createWriteStream(path);
   return new Promise(function (resolve, reject) {
     http.get(uri.href).on('response', function (res) {
-      const length = res.headers['content-length'] ? Number.parseInt(res.headers['content-length'], 10) : size; //   let downloaded = 0;
+      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', {
         complete: '=',
         incomplete: ' ',
@@ -36,10 +27,11 @@ module.exports = function (url, path, size) {
         total: length
       });
       res.on('data', function (chunk) {
-        file.write(chunk); //   downloaded += chunk.length;
+        file.write(chunk);
+        //   downloaded += chunk.length;
         //percent = ((100.0 * downloaded) / len).toFixed(2);
-
-        bar.tick(chunk.length); //   process.stdout.write(
+        bar.tick(chunk.length);
+        //   process.stdout.write(
         //     `Downloading\t${percent}%\t${filesize(downloaded, {
         //       standard: 'iec',
         //     })}\t of ${filesize(len, {

package/lib/utils/writer.js

@@ -4,20 +4,16 @@ var ResponsePayload = function (code, payload) {
   this.code = code;
   this.payload = payload;
 };
-
 exports.respondWithCode = function (code, payload) {
   return new ResponsePayload(code, payload);
 };
-
 var writeJson = exports.writeJson = function (response, argument1, argument2) {
   var code;
   var payload;
-
   if (argument1 && argument1 instanceof ResponsePayload) {
     writeJson(response, argument1.payload, argument1.code);
     return;
   }
-
   if (argument2 && Number.isInteger(argument2)) {
     code = argument2;
   } else {
@@ -25,21 +21,18 @@ var writeJson = exports.writeJson = function (response, argument1, argument2) {
       code = argument1;
     }
   }
-
   if (code && argument1) {
     payload = argument1;
   } else if (argument1) {
     payload = argument1;
   }
-
   if (!code) {
     // if no response code given, we default to 200
     code = 200;
-  } // if (typeof payload === 'object') {
+  }
+  // if (typeof payload === 'object') {
   //   payload = JSON.stringify(payload, null, 2);
   // }
-
-
   response.status(code);
   response.setHeader('Content-Type', 'application/json');
   response.json(payload);

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mountainpass/addressr",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Australian Address Validation, Search and Autocomplete",
   "author": {
     "name": "Mountain Pass",
@@ -17,7 +17,7 @@
   },
   "config": {
     "localport": "6060",
-    "SEARCH_IMAGE": "opensearchproject/opensearch:1.2.4"
+    "SEARCH_IMAGE": "opensearchproject/opensearch:1.3.20"
   },
   "scripts": {
     "gen-install-cmd": "echo \"#!/bin/sh\n\nnpm install -g ${npm_package_name}@${npm_package_version}\" > install.sh",
@@ -75,7 +75,7 @@
     "npm-check-unused": "npm-check",
     "lint": "eslint . --fix",
     "test": "NO_STRICT=' ' npm-run-all --serial test:nogeo test:geo",
-    "test:nogeo": "NO_STRICT=' ' npm-run-all --serial test:nodejs:nogeo test:rest:nogeo test:cli:nogeo",
+    "test:nogeo": "NO_STRICT=' ' npm-run-all --serial test:nodejs:nogeo test:rest:nogeo test:rest2:nogeo test:cli:nogeo",
     "test:geo": "NO_STRICT=' ' npm-run-all --serial test:nodejs:geo test:rest:geo test:cli:geo",
     "watch:test": "nodemon -V  --ext \"*.feature, *.js, *.json, *.css, *.yaml\" -x npm -- run test",
     "genversion": "genversion --es6 --semi version.js",
@@ -89,6 +89,7 @@
     "cover:rest:nogeo": "nyc --report-dir coverage/rest --temp-dir coverage/rest/.nyc_output npm run test:rest:nogeo",
     "test:rest:geo": "PORT=$npm_package_config_localport ADDRESSR_ENABLE_GEO=1 ES_INDEX_NAME=test-geo COVERED_STATES=OT DEBUG=error,api,express:*,swagger-tools*,test,es TEST_PROFILE=rest cucumber-js -p rest -- --harmony_async_iteration",
     "cover:rest:geo": "nyc --report-dir coverage/rest-geo --temp-dir coverage/rest-geo/.nyc_output npm run test:rest:geo",
+    "test:rest2:nogeo": "PORT=$npm_package_config_localport ES_INDEX_NAME=test COVERED_STATES=OT DEBUG=error,api,express:*,swagger-tools*,test,es,waychaser,waycharter TEST_PROFILE=rest2 cucumber-js -p rest2 -- --harmony_async_iteration",
     "test:rest2:geo": "PORT=$npm_package_config_localport ADDRESSR_ENABLE_GEO=1 ES_INDEX_NAME=test-geo COVERED_STATES=OT DEBUG=error,api,express:*,swagger-tools*,test,es,waychaser,waycharter TEST_PROFILE=rest2 cucumber-js -p rest2 -- --harmony_async_iteration",
     "watch:test:rest2:geo": "nodemon -V -x npm -- run ${npm_lifecycle_event#watch:}",
     "watch:test:rest:nogeo": "nodemon -V  --ext \"*.feature, *.js, *.json, *.css, *.yaml\" -x npm -- run test:rest:nogeo",
@@ -120,7 +121,10 @@
     "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\""
+    "ci:publish": "[ \"$CI\" = true ] && changeset publish || echo \"Dry run: changeset publish\"",
+    "push:watch": "bash scripts/push-and-watch.sh",
+    "release:watch": "bash scripts/release-watch.sh",
+    "test:hooks": "bats .claude/hooks/test/"
   },
   "bin": {
     "addressr-loader": "lib/bin/addressr-loader.js",
@@ -192,6 +196,7 @@
     "babel-eslint": "^10.0.2",
     "babel-plugin-istanbul": "^6.0.0",
     "babel-preset-env": "^1.7.0",
+    "bats": "^1.13.0",
     "chai": "^4.2.0",
     "cucumber": "^5.1.0",
     "eslint": "^7.9.0",
@@ -212,7 +217,6 @@
     "istanbul-middleware": "^0.2.2",
     "license-checker": "^25.0.1",
     "lint-staged": "^11.0.0",
-    "ngrok": "^4.0.1",
     "nodemon": "^2.0.4",
     "npm-check": "^5.9.0",
     "npm-run-all": "^4.1.5",