Es library upgrade (#38)

* Updates to new Library

* Remove old ES Lib

Author: dhatcher

CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Unreleased
+### Changed
+* Moved to the new @elastic/elasticsearch library
+
 ## [2.5.2] - 06-04-2021
 ### Fixed
 * Now handle negative numbers in a more consistent manner

config/default.json

@@ -1,3 +1,4 @@
+
 {
   "esConnections": {
     "local": {
@@ -13,4 +14,4 @@
       }
     }
   }
-}
+}

package-lock.json

@@ -13,9 +13,9 @@
   "author": "Danny Hatcher",
   "license": "Apache-2.0",
   "dependencies": {
+    "@elastic/elasticsearch": "^7.13.0",
     "@koopjs/logger": "^2.0.6",
     "@mapbox/geojson-rewind": "^0.5.0",
-    "elasticsearch": "14.0.0",
     "flat": "^5.0.0",
     "koop": "^4.0.4",
     "moment": "2.20.1",

package.json

@@ -23,7 +23,7 @@ module.exports = function (koop) {
         featureCollection.metadata.timeInfo.timeExtent = [this.startFieldStats.min, this.endFieldStats.max];
     };
 
-    this.getTileOffset = function (z, minimumOffset= 4.864) {
+    this.getTileOffset = function (z, minimumOffset = 4.864) {
         // Emulate the offset that would come from a feature service request with a minimum of 4.864
         // Level 22 has 0.019 meters per pixel and this increases by a factor of 2 as the tile level goes down
         return Math.max(minimumOffset, 0.019 * Math.pow(2, 22 - parseInt(z)));
@@ -151,7 +151,7 @@ module.exports = function (koop) {
                     });
                     this.esClients[esId].count(countQuery).then(function (resp) {
                         logger.debug("count resp:", resp);
-                        featureCollection.count = resp.count;
+                        featureCollection.count = resp.body.count;
                         callback(null, featureCollection);
                     }, function (err) {
                         logger.error(err.message);
@@ -195,6 +195,7 @@ module.exports = function (koop) {
                 // let startESQueryMillis = Date.now().valueOf();
                 // console.log(JSON.stringify(esQuery, null, 2));
                 let searchResponse = await this.esClients[esId].search(esQuery);
+                searchResponse = searchResponse.body;
                 // logger.debug(`Got ES Response In: ${(Date.now().valueOf() - startESQueryMillis)/1000} seconds`);
                 // let startParseMillis = Date.now().valueOf();
                 let totalHits = isNaN(searchResponse.hits.total) ? searchResponse.hits.total.value : searchResponse.hits.total;
@@ -391,37 +392,34 @@ module.exports = function (koop) {
     }
 
 
-    function queryHashAggregations(indexConfig, mapping, esQuery, geohashUtil, esClient) {
-        return new Promise((resolve, reject) => {
-            // just aggs, no need to get documents back
-            esQuery.body.size = 1;
-
-            esQuery.body.aggregations = {
-                agg_grid: {
-                    geohash_grid: {
-                        field: indexConfig.geometryField,
-                        precision: geohashUtil.precision
-                    }
+    async function queryHashAggregations(indexConfig, mapping, esQuery, geohashUtil, esClient) {
+        // just aggs, no need to get documents back
+        esQuery.body.size = 1;
+        esQuery.body.aggregations = {
+            agg_grid: {
+                geohash_grid: {
+                    field: indexConfig.geometryField,
+                    precision: geohashUtil.precision
                 }
-            };
-
-            esClient.search(esQuery).then(response => {
-                let geohashFeatures = [];
-                let hitConverter = new HitConverter();
-                for (let i = 0; i < response.aggregations.agg_grid.buckets.length; i++) {
-                    let feature = hitConverter.featureFromGeoHashBucket(response.aggregations.agg_grid.buckets[i],
-                        response.hits.hits[0], indexConfig, mapping, esQuery.body.query.bool);
-                    if (feature) {
-                        geohashFeatures.push(feature);
-                    }
+            }
+        };
+        try {
+            let result = await esClient.search(esQuery);
+            let response = result.body;
+            let geohashFeatures = [];
+            let hitConverter = new HitConverter();
+            for (let i = 0; i < response.aggregations.agg_grid.buckets.length; i++) {
+                let feature = hitConverter.featureFromGeoHashBucket(response.aggregations.agg_grid.buckets[i],
+                    response.hits.hits[0], indexConfig, mapping, esQuery.body.query.bool);
+                if (feature) {
+                    geohashFeatures.push(feature);
                 }
-                resolve(geohashFeatures);
-            }).catch(error => {
-                logger.error(error);
-                reject(error);
-            })
-
-        });
+            }
+            return Promise.resolve(geohashFeatures);
+        } catch (e) {
+            logger.error(e);
+            return Promise.reject(e);
+        }
     }
 
     function tile2long(x, z) {
@@ -481,7 +479,7 @@ module.exports = function (koop) {
         try {
             logger.debug(JSON.stringify(queryBody, null, 2));
             let response = await esClient.search(queryBody);
-            let shapeHits = response.hits.hits;
+            let shapeHits = response.body.hits.hits;
             return Promise.resolve(shapeHits);
         } catch (e) {
             return Promise.reject(e);
@@ -896,7 +894,7 @@ module.exports = function (koop) {
                         },
                         properties: customAggregation.defaultReturnFields(mapping, indexConfig, query.customAggregations)
                     };
-                    if(defaultFeature.geometry.type === "Point"){
+                    if (defaultFeature.geometry.type === "Point") {
                         defaultFeature.geometry.coordinates = defaultFeature.geometry.coordinates[0][0];
                     }
                     aggCollection.features = [defaultFeature];

src/model.js

@@ -1,5 +1,5 @@
 const appConfig = require('config');
-const elasticsearch = require('elasticsearch');
+const {Client} = require('@elastic/elasticsearch');
 
 function initializeESClients() {
     let esClients = {};
@@ -47,21 +47,21 @@ function initializeESClients() {
             esCert = fs.readFileSync(esCert);
         }
 
-        let esClient = new elasticsearch.Client({
-            hosts: hosts,
-            log: 'error',
+        let esClient = new Client({
+            node: hosts,
             requestTimeout: 900000,
             keepAlive: false,
             ssl: {
                 key: esKey,
                 cert: esCert,
                 pfx: pfx,
-                passphrase: passphrase
+                passphrase: passphrase,
+                rejectUnauthorized: false
             }
         });
         esClients[connectInfo.id] = esClient;
     }
     return esClients;
 }
 
-exports.initializeESClients = initializeESClients;
+exports.initializeESClients = initializeESClients;

src/utils/elasticConnectUtil.js

@@ -20,10 +20,10 @@ class IndexInfo{
                         this.mappings[esName] = {};
                     }
                     if(type !== undefined){
-                        this.mappings[esName][indexName] = result[Object.keys(result)[0]].mappings[type];
+                        this.mappings[esName][indexName] = result.body[Object.keys(result.body)[0]].mappings[type];
                         resolve(this.mappings[esName][indexName]);
                     } else {
-                        const mappings = result[Object.keys(result)[0]].mappings;
+                        const mappings = result.body[Object.keys(result.body)[0]].mappings;
                         this.mappings[esName][indexName] = mappings.properties;
                             resolve(this.mappings[esName][indexName]);
                     }
@@ -59,4 +59,4 @@ class IndexInfo{
     }
 }
 
-module.exports = IndexInfo;
+module.exports = IndexInfo;