@mountainpass/addressr 1.1.2 → 1.1.3

package/README.md

@@ -84,8 +84,8 @@ Or for peace of mind for your mission critical solutions, get commercial support
 2. Start open search. For example run
 
    ```
-   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
+   docker pull opensearchproject/opensearch:1.3.20
+   docker run -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" -e "plugins.security.disabled=true" opensearchproject/opensearch:1.3.20
    ```
 
 3. Start API server. In a second window run:
@@ -152,7 +152,7 @@ Or for peace of mind for your mission critical solutions, get commercial support
 
 ## How it Works
 
-![How it works](https://addressr.io/static/addressr-43fb89f43718b9b9d05becd4cb045672.svg 'How it works')
+![How it works](https://addressr.io/static/addressr-fe45ac1ba82b1dd5224f1c7356dfd1ca.svg 'How it works')
 
 ## Additional Settings
 

package/lib/ci/build.js

@@ -1,9 +1,11 @@
 #!/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.
@@ -24,15 +26,16 @@ actions:
 "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 source = client.host().directory(".");
 
-  const node = client.container().from("node:12.11.0"); // mount cloned repository into Node image
+  // 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

@@ -1,9 +1,11 @@
 #!/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.
@@ -24,49 +26,45 @@ actions:
 "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
-
+  console.log('\t...connected');
+  // get reference to the local project
   client.log;
   const workspace = client.host().directory("."); //, { exclude: ["node_modules/"] })
-  // get Node image
 
+  // 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 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
@@ -74,7 +72,8 @@ console.log('connecting...');
               npm run cover:rest:nogeo
   */
 
-  installed.withExec(["npm", "run", "build"]); // await runner.exitCode()
+  installed.withExec(["npm", "run", "build"]);
+  // await runner.exitCode()
   // .directory("node_modules/")
   // .export("./dagger_node_modules")
 });

package/lib/client/elasticsearch.js

@@ -7,17 +7,11 @@ exports.ELASTIC_PORT = undefined;
 exports.dropIndex = dropIndex;
 exports.initIndex = initIndex;
 exports.esConnect = esConnect;
-
 var _debug = require("debug");
-
 var _debug2 = _interopRequireDefault(_debug);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const waitPort = require('wait-port');
-
 const elasticsearch = require('@opensearch-project/opensearch');
-
 const logger = (0, _debug2.default)('api');
 const error = (0, _debug2.default)('error');
 const ES_INDEX_NAME = process.env.ES_INDEX_NAME || 'addressr';
@@ -26,13 +20,11 @@ const ELASTIC_HOST = process.env.ELASTIC_HOST || '127.0.0.1';
 const ELASTIC_USERNAME = process.env.ELASTIC_USERNAME || undefined;
 const ELASTIC_PASSWORD = process.env.ELASTIC_PASSWORD || undefined;
 const ELASTIC_PROTOCOL = process.env.ELASTIC_PROTOCOL || 'http';
-
 async function dropIndex(esClient) {
   // eslint-disable-next-line security/detect-non-literal-fs-filename
   let exists = await esClient.indices.exists({
     index: ES_INDEX_NAME
   });
-
   if (exists.body) {
     const deleteIndexResult = await esClient.indices.delete({
       index: ES_INDEX_NAME
@@ -41,22 +33,19 @@ async function dropIndex(esClient) {
       deleteIndexResult
     });
   }
-
-  logger('checking if index exists'); // eslint-disable-next-line security/detect-non-literal-fs-filename
-
+  logger('checking if index exists');
+  // eslint-disable-next-line security/detect-non-literal-fs-filename
   exists = await esClient.indices.exists({
     index: ES_INDEX_NAME
   });
   logger('index exists:', exists);
 }
-
 async function initIndex(esClient, clear, synonyms) {
   if (clear) {
     await dropIndex(esClient);
   }
-
-  logger('checking if index exists'); // eslint-disable-next-line security/detect-non-literal-fs-filename
-
+  logger('checking if index exists');
+  // eslint-disable-next-line security/detect-non-literal-fs-filename
   const exists = await esClient.indices.exists({
     index: ES_INDEX_NAME
   });
@@ -111,8 +100,8 @@ async function initIndex(esClient, clear, synonyms) {
             raw: {
               type: 'keyword'
             }
-          } // fielddata: true
-
+          }
+          // fielddata: true
         },
         ssla: {
           type: 'text',
@@ -129,7 +118,6 @@ async function initIndex(esClient, clear, synonyms) {
       }
     }
   };
-
   if (!exists.body) {
     logger(`creating index: ${ES_INDEX_NAME}`);
     const indexCreateResult = await esClient.indices.create({
@@ -160,8 +148,8 @@ async function initIndex(esClient, clear, synonyms) {
     });
     logger({
       indexPutMappingResult
-    }); // eslint-disable-next-line security/detect-non-literal-fs-filename
-
+    });
+    // eslint-disable-next-line security/detect-non-literal-fs-filename
     const indexOpenResult = await esClient.indices.open({
       index: ES_INDEX_NAME
     });
@@ -175,20 +163,17 @@ async function initIndex(esClient, clear, synonyms) {
       refreshResult
     });
   }
-
   const indexGetResult = await esClient.indices.get({
     index: ES_INDEX_NAME,
     includeDefaults: true
   });
   logger(`indexGetResult:\n${JSON.stringify(indexGetResult, undefined, 2)}`);
 }
-
 async function esConnect(esport = ELASTIC_PORT, eshost = ELASTIC_HOST, interval = 1000, timeout = 0) {
   // we keep trying to connect, no matter what
   // eslint-disable-next-line no-constant-condition
   while (true) {
     logger(`trying to reach elastic search on ${eshost}:${esport}...`);
-
     try {
       const open = await waitPort({
         host: eshost,
@@ -196,21 +181,23 @@ async function esConnect(esport = ELASTIC_PORT, eshost = ELASTIC_HOST, interval
         interval,
         timeout
       });
-
       if (open) {
-        logger(`...${eshost}:${esport} is reachable`); // eslint-disable-next-line no-constant-condition
+        logger(`...${eshost}:${esport} is reachable`);
 
+        // eslint-disable-next-line no-constant-condition
         while (true) {
           try {
             const node = ELASTIC_USERNAME ? `${ELASTIC_PROTOCOL}://${ELASTIC_USERNAME}:${ELASTIC_PASSWORD}@${eshost}:${esport}` : `${ELASTIC_PROTOCOL}://${eshost}:${esport}`;
             const esClientOptions = {
-              node // ...(ELASTIC_USERNAME &&
+              node
+              // ...(ELASTIC_USERNAME &&
               //   ELASTIC_PASSWORD && {
               //     cloud: {
               //       username: ELASTIC_USERNAME,
               //       password: ELASTIC_PASSWORD
               //     }
               //   })
+
               // host: [
               //   {
               //     host: eshost,
@@ -223,7 +210,6 @@ async function esConnect(esport = ELASTIC_PORT, eshost = ELASTIC_HOST, interval
               //   },
               // ],
               // log: 'info',
-
             };
             const esClient = new elasticsearch.Client(esClientOptions);
             logger(`connecting elastic search client on ${eshost}:${esport}...`);

package/lib/controllers/Addresses.js

@@ -5,19 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getAddress = getAddress;
 exports.getAddresses = getAddresses;
-
 var _debug = require("debug");
-
 var _debug2 = _interopRequireDefault(_debug);
-
 var _addressService = require("../service/address-service");
-
 var _writer = require("../utils/writer.js");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 var logger = (0, _debug2.default)('api');
-
 function getAddress(request, response) {
   logger('IN getAddress');
   var addressId = request.swagger.params['addressId'].value;
@@ -30,11 +23,9 @@ function getAddress(request, response) {
       response.setHeader('link', addressResponse.link.toString());
       (0, _writer.writeJson)(response, addressResponse.json);
     }
-
     return;
   });
 }
-
 function getAddresses(request, response) {
   var q = request.swagger.params['q'].value;
   var p = request.swagger.params['p'].value;
@@ -49,7 +40,6 @@ function getAddresses(request, response) {
       response.setHeader('link-template', addressesResponse.linkTemplate.toString());
       (0, _writer.writeJson)(response, addressesResponse.json);
     }
-
     return;
   });
 }

package/lib/controllers/Default.js

@@ -4,13 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getApiRoot = getApiRoot;
-
 var _DefaultService = require("../service/DefaultService");
-
 var _writer = require("../utils/writer.js");
-
 // import debug from 'debug';
+
 // var logger = debug('api');
+
 function getApiRoot(request, res) {
   (0, _DefaultService.getApiRoot)().then(function (response) {
     res.setHeader('link', response.link.toString());

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

@@ -2,11 +2,8 @@
 "use strict";
 
 const fs = require('fs');
-
 const packageJson = require('../package.json');
-
 const shell = require('shelljs');
-
 const {
   zip
 } = require('zip-a-folder');
@@ -30,8 +27,6 @@ TODO: Apparently if you include a node_modules folder in the deployment, AWS wil
 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,
@@ -70,12 +65,10 @@ function createPackageJson(context, filepath) {
   };
   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/loader.js

@@ -1,24 +1,16 @@
 "use strict";
 
 var _debug = require("debug");
-
 var _debug2 = _interopRequireDefault(_debug);
-
 var _elasticsearch = require("./client/elasticsearch");
-
 var _addressService = require("./service/address-service");
-
 var _printVersion = require("./service/printVersion");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const logger = (0, _debug2.default)('api');
 const error = (0, _debug2.default)('error');
-
 if (process.env.DEBUG == undefined) {
   _debug2.default.enable('api,error');
 }
-
 const start = process.hrtime();
 (0, _elasticsearch.esConnect)().then(() => {
   logger('es client connected');

package/lib/server.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 _swagger = require("./swagger");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const logger = (0, _debug2.default)('api');
 (0, _swagger.startServer)().then(() => {
   logger('connecting es client');

package/lib/service/DefaultService.js

@@ -4,34 +4,27 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getApiRoot = getApiRoot;
-
 var _debug = require("debug");
-
 var _debug2 = _interopRequireDefault(_debug);
-
 var _httpLinkHeader = require("http-link-header");
-
 var _httpLinkHeader2 = _interopRequireDefault(_httpLinkHeader);
-
 var _setLinkOptions = require("./setLinkOptions");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 var logger = (0, _debug2.default)('api');
+
 /**
  * API Root
  * returns a list of available APIs within the `Link` headers
  *
  * returns Root
  **/
-
 async function getApiRoot() {
   const paths = Object.keys(global.swaggerDoc.paths).filter(p => global.swaggerDoc.paths[p].get !== undefined && global.swaggerDoc.paths[p].get['x-root-rel'] !== undefined);
   const link = new _httpLinkHeader2.default();
   paths.forEach(p => {
     const op = global.swaggerDoc.paths[p].get;
-
-    if (op.parameters && op.parameters.find(parameter => parameter.required === true)) {// skip
+    if (op.parameters && op.parameters.find(parameter => parameter.required === true)) {
+      // skip
     } else {
       link.set({
         rel: op['x-root-rel'],